diff --git a/allianceauth/authentication/templates/authentication/dashboard.html b/allianceauth/authentication/templates/authentication/dashboard.html
index 49dfa762..7deb27f4 100644
--- a/allianceauth/authentication/templates/authentication/dashboard.html
+++ b/allianceauth/authentication/templates/authentication/dashboard.html
@@ -2,10 +2,10 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "Dashboard" %}{% endblock %}
+{% block page_title %}{% translate "Dashboard" %}{% endblock %}
 
 {% block content %}
-    <h1 class="page-header text-center">{% trans "Dashboard" %}</h1>
+    <h1 class="page-header text-center">{% translate "Dashboard" %}</h1>
     {% if user.is_staff %}
         {% include 'allianceauth/admin-status/include.html' %}
     {% endif %}
@@ -78,18 +78,18 @@
                             {% endwith %}
                         {% else %}
                             <div class="alert alert-danger" role="alert">
-                                {% trans "No main character set." %}
+                                {% translate "No main character set." %}
                             </div>
                         {% endif %}
                         <div class="clearfix"></div>
                         <div class="row">
                             <div class="col-sm-6 button-wrapper">
                                 <a href="{% url 'authentication:add_character' %}" class="btn btn-block btn-info"
-                                title="Add Character">{% trans 'Add Character' %}</a>
+                                title="Add Character">{% translate 'Add Character' %}</a>
                             </div>
                             <div class="col-sm-6 button-wrapper">
                                 <a href="{% url 'authentication:change_main_character' %}" class="btn btn-block btn-info"
-                                title="Change Main Character">{% trans "Change Main" %}</a>
+                                title="Change Main Character">{% translate "Change Main" %}</a>
                             </div>
                         </div>
                     </div>
@@ -98,7 +98,7 @@
             <div class="col-sm-6 text-center">
                 <div class="panel panel-success" style="height:100%">
                     <div class="panel-heading">
-                        <h3 class="panel-title">{% trans "Group Memberships" %}</h3>
+                        <h3 class="panel-title">{% translate "Group Memberships" %}</h3>
                     </div>
                     <div class="panel-body">
                         <div style="height: 240px;overflow:-moz-scrollbars-vertical;overflow-y:auto;">
@@ -118,7 +118,7 @@
         <div class="panel panel-default">
             <div class="panel-heading">
                 <h3 class="panel-title text-center" style="text-align: center">
-                    {% trans 'Characters' %}
+                    {% translate 'Characters' %}
                 </h3>
             </div>
             <div class="panel-body">
@@ -126,9 +126,9 @@
                     <thead>
                         <tr>
                             <th class="text-center"></th>
-                            <th class="text-center">{% trans 'Name' %}</th>
-                            <th class="text-center">{% trans 'Corp' %}</th>
-                            <th class="text-center">{% trans 'Alliance' %}</th>
+                            <th class="text-center">{% translate 'Name' %}</th>
+                            <th class="text-center">{% translate 'Corp' %}</th>
+                            <th class="text-center">{% translate 'Alliance' %}</th>
                         </tr>
                     </thead>
                     <tbody>
diff --git a/allianceauth/authentication/templates/public/base.html b/allianceauth/authentication/templates/public/base.html
index 798c270f..9ca3fc9c 100644
--- a/allianceauth/authentication/templates/public/base.html
+++ b/allianceauth/authentication/templates/public/base.html
@@ -12,7 +12,7 @@
 
         {% include 'allianceauth/icons.html' %}
 
-        <title>{% block title %}{{ SITE_NAME }}{% endblock %}</title>
+        <title>{% block title %}{% block page_title %}{% endblock page_title %} - {{ SITE_NAME }}{% endblock title %}</title>
 
         {% include 'bundles/bootstrap-css.html' %}
         {% include 'bundles/fontawesome.html' %}
diff --git a/allianceauth/authentication/templates/public/login.html b/allianceauth/authentication/templates/public/login.html
index 9a7921e7..5460b330 100644
--- a/allianceauth/authentication/templates/public/login.html
+++ b/allianceauth/authentication/templates/public/login.html
@@ -1,6 +1,10 @@
 {% extends 'public/middle_box.html' %}
+
+{% load i18n %}
 {% load static %}
-{% block page_title %}Login{% endblock %}
+
+{% block page_title %}{% translate "Login" %}{% endblock %}
+
 {% block middle_box_content %}
     <a href="{% url 'auth_sso_login' %}{% if request.GET.next %}?next={{request.GET.next}}{%endif%}">
         <img class="img-responsive center-block" src="{% static 'img/sso/EVE_SSO_Login_Buttons_Large_Black.png' %}" border=0>
diff --git a/allianceauth/authentication/templates/public/middle_box.html b/allianceauth/authentication/templates/public/middle_box.html
index 005e86bf..862eb747 100644
--- a/allianceauth/authentication/templates/public/middle_box.html
+++ b/allianceauth/authentication/templates/public/middle_box.html
@@ -1,6 +1,6 @@
 {% extends 'public/base.html' %}
 {% load static %}
-{% block title %}Login{% endblock %}
+
 {% block content %}
     <div class="col-md-4 col-md-offset-4">
         {% if messages %}
diff --git a/allianceauth/authentication/templates/public/register.html b/allianceauth/authentication/templates/public/register.html
index 05bc685b..685e37e3 100644
--- a/allianceauth/authentication/templates/public/register.html
+++ b/allianceauth/authentication/templates/public/register.html
@@ -1,13 +1,17 @@
 {% extends 'public/base.html' %}
+
 {% load static %}
 {% load bootstrap %}
 {% load i18n %}
-{% block page_title %}Registration{% endblock %}
+
+{% block page_title %}{%  translate "Registration" %}{% endblock %}
+
 {% block extra_include %}
     {% include 'bundles/bootstrap-css.html' %}
     {% include 'bundles/fontawesome.html' %}
     {% include 'bundles/bootstrap-js.html' %}
 {% endblock %}
+
 {% block content %}
     <div class="col-md-4 col-md-offset-4">
         <div class="panel panel-default panel-transparent">
@@ -15,7 +19,7 @@
                 <form method="POST">
                     {% csrf_token %}
                     {{ form|bootstrap }}
-                    <button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Register" %}</button>
+                    <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Register" %}</button>
                 </form>
             </div>
         </div>
diff --git a/allianceauth/authentication/templates/registration/activate.html b/allianceauth/authentication/templates/registration/activate.html
index c5635df5..b5b9bfc1 100644
--- a/allianceauth/authentication/templates/registration/activate.html
+++ b/allianceauth/authentication/templates/registration/activate.html
@@ -1,5 +1,5 @@
 {% extends 'public/middle_box.html' %}
 {% load i18n %}
 {% block middle_box_content %}
-    <div class="alert alert-danger">{% trans 'Invalid or expired activation link.' %}</div>
+    <div class="alert alert-danger">{% translate 'Invalid or expired activation link.' %}</div>
 {% endblock %}
diff --git a/allianceauth/authentication/templates/registration/password_reset_email.html b/allianceauth/authentication/templates/registration/password_reset_email.html
index 6d66e74f..79d19b0e 100644
--- a/allianceauth/authentication/templates/registration/password_reset_email.html
+++ b/allianceauth/authentication/templates/registration/password_reset_email.html
@@ -2,13 +2,13 @@
     {% 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:" %}
+    {% translate "Please go to the following page and choose a new password:" %}
     {% block reset_link %}
         {{domain}}{% url 'password_reset_confirm' uidb64=uid token=token %}
     {% endblock %}
-    {% trans "Your username, in case you've forgotten:" %} {{ user.get_username }}
+    {% translate "Your username, in case you've forgotten:" %} {{ user.get_username }}
 
-    {% trans "Thanks for using our site!" %}
+    {% translate "Thanks for using our site!" %}
 
     {% blocktrans %}Your IT Team{% endblocktrans %}
 
diff --git a/allianceauth/authentication/templates/registration/registration_form.html b/allianceauth/authentication/templates/registration/registration_form.html
index 12dbe6d2..4ff43e41 100644
--- a/allianceauth/authentication/templates/registration/registration_form.html
+++ b/allianceauth/authentication/templates/registration/registration_form.html
@@ -8,7 +8,7 @@
         {% csrf_token %}
         {{ form|bootstrap }}
         <br/>
-        <button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Submit" %}</button>
+        <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Submit" %}</button>
         <br/>
     </form>
 {% endblock %}
diff --git a/allianceauth/corputils/templates/corputils/base.html b/allianceauth/corputils/templates/corputils/base.html
index d23bd86e..17300d94 100644
--- a/allianceauth/corputils/templates/corputils/base.html
+++ b/allianceauth/corputils/templates/corputils/base.html
@@ -1,15 +1,15 @@
 {% extends 'allianceauth/base.html' %}
 {% load i18n %}
-{% block page_title %}{% trans "Corporation Member Data" %}{% endblock %}
+{% block page_title %}{% translate "Corporation Member Data" %}{% endblock %}
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% trans "Corporation Member Data" %}</h1>
+        <h1 class="page-header text-center">{% translate "Corporation Member Data" %}</h1>
         <div class="col-lg-10 col-lg-offset-1 container">
             <nav class="navbar navbar-default">
                 <div class="container-fluid">
                     <ul class="nav navbar-nav">
                         <li class="dropdown">
-                            <a href="#" id="dLabel" class="dropdown-toggle" role="button" data-toggle="dropdown" aria-haspopup="false" aria-expanded="false">{% trans "Corporations" %}<span class="caret"></span></a>
+                            <a href="#" id="dLabel" class="dropdown-toggle" role="button" data-toggle="dropdown" aria-haspopup="false" aria-expanded="false">{% translate "Corporations" %}<span class="caret"></span></a>
                             <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
                                 {% for corpstat in available %}
                                     <li>
@@ -20,13 +20,13 @@
                         </li>
                         {% if perms.corputils.add_corpstats %}
                             <li>
-                                <a href="{% url 'corputils:add' %}">{% trans "Add" %}</a>
+                                <a href="{% url 'corputils:add' %}">{% translate "Add" %}</a>
                             </li>
                         {% endif %}
                     </ul>
                     <form class="navbar-form navbar-right" role="search" action="{% url 'corputils:search' %}" method="GET">
                         <div class="form-group">
-                            <input type="text" class="form-control" name="search_string" placeholder="{% if search_string %}{{ search_string }}{% else %}{% trans "Search all corporations..." %}{% endif %}">
+                            <input type="text" class="form-control" name="search_string" placeholder="{% if search_string %}{{ search_string }}{% else %}{% translate "Search all corporations..." %}{% endif %}">
                         </div>
                     </form>
                 </div>
diff --git a/allianceauth/corputils/templates/corputils/corpstats.html b/allianceauth/corputils/templates/corputils/corpstats.html
index e8655422..df5a8527 100644
--- a/allianceauth/corputils/templates/corputils/corpstats.html
+++ b/allianceauth/corputils/templates/corputils/corpstats.html
@@ -30,12 +30,12 @@
                 <div class="panel panel-default">
                     <div class="panel-heading">
                         <ul class="nav nav-pills pull-left">
-                            <li class="active"><a href="#mains" data-toggle="pill">{% trans 'Mains' %} ({{ total_mains }})</a></li>
-                            <li><a href="#members" data-toggle="pill">{% trans 'Members' %} ({{ corpstats.member_count }})</a></li>
-                            <li><a href="#unregistered" data-toggle="pill">{% trans 'Unregistered' %} ({{ unregistered.count }})</a></li>
+                            <li class="active"><a href="#mains" data-toggle="pill">{% translate 'Mains' %} ({{ total_mains }})</a></li>
+                            <li><a href="#members" data-toggle="pill">{% translate 'Members' %} ({{ corpstats.member_count }})</a></li>
+                            <li><a href="#unregistered" data-toggle="pill">{% translate 'Unregistered' %} ({{ unregistered.count }})</a></li>
                         </ul>
                         <div class="pull-right hidden-xs">
-                            {% trans "Last update:" %} {{ corpstats.last_update|naturaltime }}&nbsp;
+                            {% translate "Last update:" %} {{ corpstats.last_update|naturaltime }}&nbsp;
                             <a class="btn btn-success" type="button" href="{% url 'corputils:update' corpstats.corp.corporation_id %}" title="Update Now">
                                 <span class="glyphicon glyphicon-refresh"></span>
                             </a>
@@ -71,9 +71,9 @@
                                                                     {% if forloop.first %}
                                                                         <tr>
                                                                             <th></th>
-                                                                            <th class="text-center">{% trans "Character" %}</th>
-                                                                            <th class="text-center">{% trans "Corporation" %}</th>
-                                                                            <th class="text-center">{% trans "Alliance" %}</th>
+                                                                            <th class="text-center">{% translate "Character" %}</th>
+                                                                            <th class="text-center">{% translate "Corporation" %}</th>
+                                                                            <th class="text-center">{% translate "Alliance" %}</th>
                                                                             <th class="text-center"></th>
                                                                         </tr>
                                                                     {% endif %}
@@ -88,7 +88,7 @@
                                                                         <td class="text-center" style="width:30%">{{ alt.alliance_name }}</td>
                                                                         <td class="text-center" style="width:5%">
                                                                             <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="label label-danger" target="_blank">
-                                                                                {% trans "Killboard" %}
+                                                                                {% translate "Killboard" %}
                                                                             </a>
                                                                         </td>
                                                                     </tr>
@@ -109,11 +109,11 @@
                                             <thead>
                                                 <tr>
                                                     <th></th>
-                                                    <th class="text-center">{% trans "Character" %}</th>
+                                                    <th class="text-center">{% translate "Character" %}</th>
                                                     <th class="text-center"></th>
-                                                    <th class="text-center">{% trans "Main Character" %}</th>
-                                                    <th class="text-center">{% trans "Main Corporation" %}</th>
-                                                    <th class="text-center">{% trans "Main Alliance" %}</th>
+                                                    <th class="text-center">{% translate "Main Character" %}</th>
+                                                    <th class="text-center">{% translate "Main Corporation" %}</th>
+                                                    <th class="text-center">{% translate "Main Alliance" %}</th>
                                                 </tr>
                                             </thead>
                                             <tbody>
@@ -122,7 +122,7 @@
                                                         <td><img src="{{ member.portrait_url }}" class="img-circle"></td>
                                                         <td class="text-center">{{ member }}</td>
                                                         <td class="text-center">
-                                                            <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="label label-danger" target="_blank">{% trans "Killboard" %}</a>
+                                                            <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="label label-danger" target="_blank">{% translate "Killboard" %}</a>
                                                         </td>
                                                         <td class="text-center">{{ member.character_ownership.user.profile.main_character.character_name }}</td>
                                                         <td class="text-center">{{ member.character_ownership.user.profile.main_character.corporation_name }}</td>
@@ -134,7 +134,7 @@
                                                         <td><img src="{{ member.portrait_url }}" class="img-circle"></td>
                                                         <td class="text-center">{{ member.character_name }}</td>
                                                         <td class="text-center">
-                                                            <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="label label-danger" target="_blank">{% trans "Killboard" %}</a>
+                                                            <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="label label-danger" target="_blank">{% translate "Killboard" %}</a>
                                                         </td>
                                                         <td class="text-center"></td>
                                                         <td class="text-center"></td>
@@ -153,7 +153,7 @@
                                             <thead>
                                                 <tr>
                                                     <th></th>
-                                                    <th class="text-center">{% trans "Character" %}</th>
+                                                    <th class="text-center">{% translate "Character" %}</th>
                                                     <th class="text-center"></th>
                                                 </tr>
                                             </thead>
@@ -164,7 +164,7 @@
                                                         <td class="text-center">{{ member.character_name }}</td>
                                                         <td class="text-center">
                                                             <a href="https://zkillboard.com/character/{{ member.character_id }}/" class="label label-danger" target="_blank">
-                                                                {% trans "Killboard" %}
+                                                                {% translate "Killboard" %}
                                                             </a>
                                                         </td>
                                                     </tr>
diff --git a/allianceauth/corputils/templates/corputils/search.html b/allianceauth/corputils/templates/corputils/search.html
index 3f9176bb..502f748a 100644
--- a/allianceauth/corputils/templates/corputils/search.html
+++ b/allianceauth/corputils/templates/corputils/search.html
@@ -3,19 +3,19 @@
 {% block member_data %}
     <div class="panel panel-default">
         <div class="panel-heading clearfix">
-            <div class="panel-title pull-left">{% trans "Search Results" %}</div>
+            <div class="panel-title pull-left">{% translate "Search Results" %}</div>
         </div>
         <div class="panel-body">
             <table class="table table-hover" id="table-search">
                 <thead>
                     <tr>
                         <th class="text-center"></th>
-                        <th class="text-center">{% trans "Character" %}</th>
-                        <th class="text-center">{% trans "Corporation" %}</th>
-                        <th class="text-center">{% trans "zKillboard" %}</th>
-                        <th class="text-center">{% trans "Main Character" %}</th>
-                        <th class="text-center">{% trans "Main Corporation" %}</th>
-                        <th class="text-center">{% trans "Main Alliance" %}</th>
+                        <th class="text-center">{% translate "Character" %}</th>
+                        <th class="text-center">{% translate "Corporation" %}</th>
+                        <th class="text-center">{% translate "zKillboard" %}</th>
+                        <th class="text-center">{% translate "Main Character" %}</th>
+                        <th class="text-center">{% translate "Main Corporation" %}</th>
+                        <th class="text-center">{% translate "Main Alliance" %}</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -24,7 +24,7 @@
                             <td class="text-center"><img src="{{ result.1.portrait_url }}" class="img-circle"></td>
                             <td class="text-center">{{ result.1.character_name }}</td>
                             <td class="text-center">{{ result.0.corp.corporation_name }}</td>
-                            <td class="text-center"><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="label label-danger" target="_blank">{% trans "Killboard" %}</a></td>
+                            <td class="text-center"><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="label label-danger" target="_blank">{% translate "Killboard" %}</a></td>
                             <td class="text-center">{{ result.1.main_character.character_name }}</td>
                             <td class="text-center">{{ result.1.main_character.corporation_name }}</td>
                             <td class="text-center">{{ result.1.main_character.alliance_name }}</td>
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html
index dc567b56..ffd4319a 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html
@@ -1,10 +1,10 @@
 {% extends 'allianceauth/base.html' %}
 {% load i18n %}
-{% block page_title %}{% trans "Fleet Participation" %}{% endblock %}
+{% block page_title %}{% translate "Fleet Participation" %}{% endblock %}
 
 {% block content %}
 <div class="col-lg-12">
-    <h1 class="page-header text-center">{% trans "Character not found!" %}</h1>
+    <h1 class="page-header text-center">{% translate "Character not found!" %}</h1>
     <div class="col-lg-12 container" id="example">
         <div class="row">
             <div class="col-lg-12">
@@ -15,8 +15,8 @@
                             <img class="ra-avatar img-responsive" src="{{ character_portrait_url }}">
                         </div>
                         <div class="col-lg-10 col-sm-2">
-                            <div class="alert alert-danger" role="alert">{% trans "Character not registered!" %}</div>
-                            {% trans "This character is not associated with an auth account." %} <a href=" {% url 'authentication:add_character' %}">{% trans "Add it here" %}</a> {% trans "before attempting to click fleet attendance links." %}
+                            <div class="alert alert-danger" role="alert">{% translate "Character not registered!" %}</div>
+                            {% translate "This character is not associated with an auth account." %} <a href=" {% url 'authentication:add_character' %}">{% translate "Add it here" %}</a> {% translate "before attempting to click fleet attendance links." %}
                         </div>
                     </div>
                 </div>
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
index 032159cc..b6f241e8 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
@@ -3,15 +3,15 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "Create Fatlink" %}{% endblock page_title %}
+{% block page_title %}{% translate "Create Fatlink" %}{% endblock page_title %}
 
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% trans "Create Fleet Operation" %}</h1>
+        <h1 class="page-header text-center">{% translate "Create Fleet Operation" %}</h1>
 
         <div class="container-fluid">
             {% if badrequest %}
-            <div class="alert alert-danger" role="alert">{% trans "Bad request!" %}</div>
+            <div class="alert alert-danger" role="alert">{% translate "Bad request!" %}</div>
             {% endif %}
             {% for message in errormessages %}
             <div class="alert alert-danger" role="alert">{{ message }}</div>
@@ -22,7 +22,7 @@
                             {% csrf_token %}
                             {{ form|bootstrap }}
                             <br/>
-                            <button class="btn btn-lg btn-primary btn-block" type="submit" name="submit_fat">{% trans "Create fatlink" %}</button>
+                            <button class="btn btn-lg btn-primary btn-block" type="submit" name="submit_fat">{% translate "Create fatlink" %}</button>
                         </form>
                 </div>
             </div>
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
index 522b19e8..20b155de 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
@@ -2,29 +2,29 @@
 {% load bootstrap %}
 {% load static %}
 {% load i18n %}
-{% block page_title %}{% trans "Fatlink view" %}{% endblock page_title %}
+{% block page_title %}{% translate "Fatlink view" %}{% endblock page_title %}
 
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% trans "Edit fatlink" %} "{{ fatlink }}"
+        <h1 class="page-header text-center">{% translate "Edit fatlink" %} "{{ fatlink }}"
             <div class="text-right">
                 <form>
                     <button type="submit" onclick="return confirm('Are you sure?')" class="btn btn-danger" name="deletefat" value="True">
-                        {% trans "Delete fat" %}
+                        {% translate "Delete fat" %}
                     </button>
                 </form>
             </div>
         </h1>
         <div class="panel panel-default">
-            <div class="panel-heading">{% trans "Registered characters" %}</div>
+            <div class="panel-heading">{% translate "Registered characters" %}</div>
             <div class="panel-body">
                 <table class="table table-responsive table-hover">
                     <tr>
-                        <th class="text-center">{% trans "User" %}</th>
-                        <th class="text-center">{% trans "Character" %}</th>
-                        <th class="text-center">{% trans "System" %}</th>
-                        <th class="text-center">{% trans "Ship" %}</th>
-                        <th class="text-center">{% trans "Eve Time" %}</th>
+                        <th class="text-center">{% translate "User" %}</th>
+                        <th class="text-center">{% translate "Character" %}</th>
+                        <th class="text-center">{% translate "System" %}</th>
+                        <th class="text-center">{% translate "Ship" %}</th>
+                        <th class="text-center">{% translate "Eve Time" %}</th>
                         <th></th>
                     </tr>
                     {% for fat in registered_fats %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
index 3bd39fe0..2c87554c 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
@@ -3,15 +3,15 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "Personal fatlink statistics" %}{% endblock page_title %}
+{% block page_title %}{% translate "Personal fatlink statistics" %}{% endblock page_title %}
 
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% blocktrans %}Participation data statistics for {{ month }}, {{ year }}{% endblocktrans %}
             {% if char_id %}
             <div class="text-right">
-                <a href="{% url 'fatlink:user_statistics_month' char_id previous_month|date:'Y' previous_month|date:'m' %}" class="btn btn-info">{% trans "Previous month" %}</a>
-                <a href="{% url 'fatlink:user_statistics_month' char_id next_month|date:'Y' next_month|date:'m'  %}" class="btn btn-info">{% trans "Next month" %}</a>
+                <a href="{% url 'fatlink:user_statistics_month' char_id previous_month|date:'Y' previous_month|date:'m' %}" class="btn btn-info">{% translate "Previous month" %}</a>
+                <a href="{% url 'fatlink:user_statistics_month' char_id next_month|date:'Y' next_month|date:'m'  %}" class="btn btn-info">{% translate "Next month" %}</a>
             </div>
             {% endif %}
         </h1>
@@ -24,8 +24,8 @@
         </h2>
         <table class="table table-responsive">
             <tr>
-                <th class="col-md-2 text-center">{% trans "Ship" %}</th>
-                <th class="col-md-2 text-center">{% trans "Times used" %}</th>
+                <th class="col-md-2 text-center">{% translate "Ship" %}</th>
+                <th class="col-md-2 text-center">{% translate "Times used" %}</th>
             </tr>
             {% for ship, n_fats in shipStats %}
             <tr>
@@ -45,11 +45,11 @@
         {% if created_fats %}
         <table class="table">
             <tr>
-                <th class="text-center">{% trans "Fleet" %}</th>
-                <th class="text-center">{% trans "Creator" %}</th>
-                <th class="text-center">{% trans "Eve Time" %}</th>
-                <th class="text-center">{% trans "Duration" %}</th>
-                <th class="text-center">{% trans "Edit" %}</th>
+                <th class="text-center">{% translate "Fleet" %}</th>
+                <th class="text-center">{% translate "Creator" %}</th>
+                <th class="text-center">{% translate "Eve Time" %}</th>
+                <th class="text-center">{% translate "Duration" %}</th>
+                <th class="text-center">{% translate "Edit" %}</th>
             </tr>
             {% for link in created_fats %}
             <tr>
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
index b3678865..673a79e0 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
@@ -3,23 +3,23 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "Personal fatlink statistics" %}{% endblock page_title %}
+{% block page_title %}{% translate "Personal fatlink statistics" %}{% endblock page_title %}
 
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% blocktrans %}Participation data statistics for {{ year }}{% endblocktrans %}
             <div class="text-right">
-                <a href="{% url 'fatlink:personal_statistics_year' previous_year %}" class="btn btn-info">{% trans "Previous year" %}</a>
+                <a href="{% url 'fatlink:personal_statistics_year' previous_year %}" class="btn btn-info">{% translate "Previous year" %}</a>
                 {%  if next_year %}
-                <a href="{% url 'fatlink:personal_statistics_year' next_year  %}" class="btn btn-info">{% trans "Next year" %}</a>
+                <a href="{% url 'fatlink:personal_statistics_year' next_year  %}" class="btn btn-info">{% translate "Next year" %}</a>
                 {%  endif %}
             </div>
         </h1>
         <div class="col-lg-2 col-lg-offset-5">
         <table class="table table-responsive">
             <tr>
-                <th class="col-md-2 text-center">{% trans "Month" %}</th>
-                <th class="col-md-2 text-center">{% trans "Fats" %}</th>
+                <th class="col-md-2 text-center">{% translate "Month" %}</th>
+                <th class="col-md-2 text-center">{% translate "Fats" %}</th>
             </tr>
             {% for monthnr, month, n_fats in monthlystats %}
             <tr>
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html
index 2f33db19..9d58af09 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html
@@ -3,15 +3,15 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "Fatlink Corp Statistics" %}{% endblock page_title %}
+{% block page_title %}{% translate "Fatlink Corp Statistics" %}{% endblock page_title %}
 
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% blocktrans %}Participation data statistics for {{ month }}, {{ year }}{% endblocktrans %}
             <div class="text-right">
-                <a href="{% url 'fatlink:statistics_corp_month' corpid previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% trans "Previous month" %}</a>
+                <a href="{% url 'fatlink:statistics_corp_month' corpid previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% translate "Previous month" %}</a>
                 {%  if next_month %}
-                <a href="{% url 'fatlink:statistics_corp_month' corpid next_month|date:"Y" next_month|date:"m" %}" class="btn btn-info">{% trans "Next month" %}</a>
+                <a href="{% url 'fatlink:statistics_corp_month' corpid next_month|date:"Y" next_month|date:"m" %}" class="btn btn-info">{% translate "Next month" %}</a>
                 {%  endif %}
             </div>
         </h1>
@@ -19,10 +19,10 @@
         <table class="table table-responsive">
             <tr>
                 <th class="col-md-1"></th>
-                <th class="col-md-2 text-center">{% trans "Main Character" %}</th>
-                <th class="col-md-2 text-center">{% trans "Characters" %}</th>
-                <th class="col-md-2 text-center">{% trans "Fats" %}</th>
-                <th class="col-md-2 text-center">{% trans "Average fats" %}
+                <th class="col-md-2 text-center">{% translate "Main Character" %}</th>
+                <th class="col-md-2 text-center">{% translate "Characters" %}</th>
+                <th class="col-md-2 text-center">{% translate "Fats" %}</th>
+                <th class="col-md-2 text-center">{% translate "Average fats" %}
                     <i class="glyphicon glyphicon-question-sign" rel="tooltip" title="Fats ÷ Characters"></i>
                 </th>
             </tr>
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
index 7049cb96..35fdda5a 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
@@ -3,15 +3,15 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "Fatlink statistics" %}{% endblock page_title %}
+{% block page_title %}{% translate "Fatlink statistics" %}{% endblock page_title %}
 
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% blocktrans %}Participation data statistics for {{ month }}, {{ year }}{% endblocktrans %}
             <div class="text-right">
-                <a href="{% url 'fatlink:statistics_month' previous_month|date:"Y" previous_month|date:"m"  %}" class="btn btn-info">{% trans "Previous month" %}</a>
+                <a href="{% url 'fatlink:statistics_month' previous_month|date:"Y" previous_month|date:"m"  %}" class="btn btn-info">{% translate "Previous month" %}</a>
                 {%  if next_month %}
-                <a href="{% url 'fatlink:statistics_month' next_month|date:"Y" next_month|date:"m"  %}" class="btn btn-info">{% trans "Next month" %}</a>
+                <a href="{% url 'fatlink:statistics_month' next_month|date:"Y" next_month|date:"m"  %}" class="btn btn-info">{% translate "Next month" %}</a>
                 {%  endif %}
             </div>
         </h1>
@@ -19,11 +19,11 @@
         <table class="table table-responsive">
             <tr>
                 <th class="col-md-1"></th>
-                <th class="col-md-2 text-center">{% trans "Ticker" %}</th>
-                <th class="col-md-5 text-center">{% trans "Corp" %}</th>
-                <th class="col-md-2 text-center">{% trans "Members" %}</th>
-                <th class="col-md-2 text-center">{% trans "Fats" %}</th>
-                <th class="col-md-2 text-center">{% trans "Average fats" %}
+                <th class="col-md-2 text-center">{% translate "Ticker" %}</th>
+                <th class="col-md-5 text-center">{% translate "Corp" %}</th>
+                <th class="col-md-2 text-center">{% translate "Members" %}</th>
+                <th class="col-md-2 text-center">{% translate "Fats" %}</th>
+                <th class="col-md-2 text-center">{% translate "Average fats" %}
                     <i class="glyphicon glyphicon-question-sign" rel="tooltip" title="Fats ÷ Characters"></i>
                 </th>
             </tr>
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
index 49a2df4e..8afae5ad 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
@@ -3,20 +3,20 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "Fatlink view" %}{% endblock page_title %}
+{% block page_title %}{% translate "Fatlink view" %}{% endblock page_title %}
 
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% trans "Participation data" %}</h1>
+        <h1 class="page-header text-center">{% translate "Participation data" %}</h1>
         <table class="table">
                 <tr>
                     <th class="col-md-11">
-                        <h4><b>{% trans "Most recent clicked fatlinks" %}</b>
+                        <h4><b>{% translate "Most recent clicked fatlinks" %}</b>
                         </h4>
                     </th>
                     <th class="col-md-1">
                         <a href="{% url 'fatlink:personal_statistics' %}" class="btn btn-info">
-                            {% trans "Personal statistics" %}
+                            {% translate "Personal statistics" %}
                         </a>
                     </th>
                 </tr>
@@ -24,11 +24,11 @@
         {% if fats %}
         <table class="table table-responsive">
             <tr>
-                <th class="text-center">{% trans "Fleet" %}</th>
-                <th class="text-center">{% trans "Character" %}</th>
-                <th class="text-center">{% trans "System" %}</th>
-                <th class="text-center">{% trans "Ship" %}</th>
-                <th class="text-center">{% trans "Eve Time" %}</th>
+                <th class="text-center">{% translate "Fleet" %}</th>
+                <th class="text-center">{% translate "Character" %}</th>
+                <th class="text-center">{% translate "System" %}</th>
+                <th class="text-center">{% translate "Ship" %}</th>
+                <th class="text-center">{% translate "Eve Time" %}</th>
             </tr>
             {% for fat in fats %}
             <tr>
@@ -45,24 +45,24 @@
             {% endfor %}
         </table>
         {% else %}
-        <div class="alert alert-warning text-center">{% trans "No fleet activity on record." %}</div>
+        <div class="alert alert-warning text-center">{% translate "No fleet activity on record." %}</div>
         {% endif %}
 
         {% if perms.auth.fleetactivitytracking%}
             <table class="table">
                 <tr>
                     <th class="col-md-10">
-                        <h4><b>{% trans "Most recent fatlinks" %}</b>
+                        <h4><b>{% translate "Most recent fatlinks" %}</b>
                         </h4>
                     </th>
                     <th class="col-md-1">
                         <a href="{% url 'fatlink:statistics' %}" class="btn btn-info">
-                            {% trans "View statistics" %}
+                            {% translate "View statistics" %}
                         </a>
                     </th>
                     <th class="col-md-1">
                         <a href="{% url 'fatlink:create' %}" class="btn btn-success">
-                            {% trans "Create fatlink" %}
+                            {% translate "Create fatlink" %}
                         </a>
                     </th>
                 </tr>
@@ -70,12 +70,12 @@
         {% if fatlinks %}
         <table class="table">
             <tr>
-                <th class="text-center">{% trans "Name" %}</th>
-                <th class="text-center">{% trans "Creator" %}</th>
-                <th class="text-center">{% trans "Fleet" %}</th>
-                <th class="text-center">{% trans "Eve Time" %}</th>
-                <th class="text-center">{% trans "Duration" %}</th>
-                <th class="text-center">{% trans "Edit" %}</th>
+                <th class="text-center">{% translate "Name" %}</th>
+                <th class="text-center">{% translate "Creator" %}</th>
+                <th class="text-center">{% translate "Fleet" %}</th>
+                <th class="text-center">{% translate "Eve Time" %}</th>
+                <th class="text-center">{% translate "Duration" %}</th>
+                <th class="text-center">{% translate "Edit" %}</th>
             </tr>
             {% for link in fatlinks %}
             <tr>
@@ -94,7 +94,7 @@
 
         </table>
         {% else %}
-        <div class="alert alert-warning text-center">{% trans "No created fatlinks on record." %}</div>
+        <div class="alert alert-warning text-center">{% translate "No created fatlinks on record." %}</div>
         {% endif %}
         {% endif %}
     </div>
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/audit.html b/allianceauth/groupmanagement/templates/groupmanagement/audit.html
index 5f4b278d..7f1dc73b 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/audit.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/audit.html
@@ -2,7 +2,7 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{{ group }} {% trans "Audit Log" %}{% endblock page_title %}
+{% block page_title %}{{ group }} {% translate "Audit Log" %}{% endblock page_title %}
 
 {% block content %}
     <div class="col-lg-12">
@@ -11,13 +11,13 @@
 
         <div class="panel panel-default">
             <div class="panel-heading">
-                {{ group }} - {% trans "Audit Log" %}
+                {{ group }} - {% translate "Audit Log" %}
             </div>
 
             <div class="panel-body">
                 <p>
                     <a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
-                        {% trans "Back" %}
+                        {% translate "Back" %}
                     </a>
                 </p>
 
@@ -25,13 +25,13 @@
                     <div class="table-responsive">
                         <table class="table table-striped" id="log-entries">
                             <thead>
-                                <th scope="col">{% trans "Date/Time" %}</th>
-                                <th scope="col">{% trans "Requestor" %}</th>
-                                <th scope="col">{% trans "Character" %}</th>
-                                <th scope="col">{% trans "Corporation" %}</th>
-                                <th scope="col">{% trans "Type" %}</th>
-                                <th scope="col">{% trans "Action" %}</th>
-                                <th scope="col">{% trans "Actor" %}</th>
+                                <th scope="col">{% translate "Date/Time" %}</th>
+                                <th scope="col">{% translate "Requestor" %}</th>
+                                <th scope="col">{% translate "Character" %}</th>
+                                <th scope="col">{% translate "Corporation" %}</th>
+                                <th scope="col">{% translate "Type" %}</th>
+                                <th scope="col">{% translate "Action" %}</th>
+                                <th scope="col">{% translate "Actor" %}</th>
                             </thead>
 
                             <tbody>
@@ -44,7 +44,7 @@
                                         <td>{{ entry.type_to_str }}</td>
 
                                         {% if entry.request_type is None %}
-                                            <td>{% trans "Removed" %}</td>
+                                            <td>{% translate "Removed" %}</td>
                                         {% else %}
                                             <td>{{ entry.action_to_str }}</td>
                                         {% endif %}
@@ -56,14 +56,14 @@
                         </table>
 
                         <p class="text-muted">
-                            {% trans "All times displayed are EVE/UTC." %}
+                            {% translate "All times displayed are EVE/UTC." %}
                         </p>
                     </div>
                 {% else %}
                     <div class="clearfix"></div>
                     <br>
                     <div class="alert alert-warning text-center">
-                        {% trans "No entries found for this group." %}
+                        {% translate "No entries found for this group." %}
                     </div>
                 {% endif %}
             </div>
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
index f7b58d54..1ce7e3fd 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load evelinks %}
 
-{% block page_title %}{% trans "Group Members" %}{% endblock page_title %}
+{% block page_title %}{% translate "Group Members" %}{% endblock page_title %}
 
 {% block content %}
     <div class="col-lg-12">
@@ -12,13 +12,13 @@
 
         <div class="panel panel-default">
             <div class="panel-heading">
-                {{ group.name }} - {% trans 'Members' %}
+                {{ group.name }} - {% translate 'Members' %}
             </div>
 
             <div class="panel-body">
                 <p>
                     <a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
-                        {% trans "Back" %}
+                        {% translate "Back" %}
                     </a>
                 </p>
 
@@ -27,8 +27,8 @@
                         <table class="table table-aa" id="tab_group_members">
                             <thead>
                                 <tr>
-                                    <th>{% trans "Character" %}</th>
-                                    <th>{% trans "Organization" %}</th>
+                                    <th>{% translate "Character" %}</th>
+                                    <th>{% translate "Organization" %}</th>
                                     <th></th>
                                 </tr>
                             </thead>
@@ -47,7 +47,7 @@
                                             {% endif %}
 
                                             {% if member.is_leader %}
-                                                <i class="fas fa-star" title="{% trans "Group leader" %}" style="margin-left: 1rem;"></i>&nbsp;
+                                                <i class="fas fa-star" title="{% translate "Group leader" %}" style="margin-left: 1rem;"></i>&nbsp;
                                             {% endif %}
                                         </td>
 
@@ -58,12 +58,12 @@
                                                 </a><br>
                                                 {{ member.main_char.alliance_name|default_if_none:"" }}
                                             {% else %}
-                                                {% trans "(unknown)" %}
+                                                {% translate "(unknown)" %}
                                             {% endif %}
                                         </td>
 
                                         <td class="text-right">
-                                            <a href="{% url 'groupmanagement:membership_remove' group.id member.user.id %}" class="btn btn-danger" title="{% trans "Remove from group" %}">
+                                            <a href="{% url 'groupmanagement:membership_remove' group.id member.user.id %}" class="btn btn-danger" title="{% translate "Remove from group" %}">
                                                 <i class="glyphicon glyphicon-remove"></i>
                                             </a>
                                         </td>
@@ -73,12 +73,12 @@
                         </table>
 
                         <p class="text-muted">
-                            <i class="fas fa-star"></i>: {% trans "Group leader" %}
+                            <i class="fas fa-star"></i>: {% translate "Group leader" %}
                         </p>
                     </div>
                 {% else %}
                     <div class="alert alert-warning text-center">
-                        {% trans "No group members to list." %}
+                        {% translate "No group members to list." %}
                     </div>
                 {% endif %}
             </div>
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
index dd43ede1..08cf4633 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
@@ -2,7 +2,7 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "Groups Membership" %}{% endblock page_title %}
+{% block page_title %}{% translate "Groups Membership" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
@@ -12,7 +12,7 @@
 
         <div class="panel panel-default">
             <div class="panel-heading">
-                {% trans "Groups" %}
+                {% translate "Groups" %}
             </div>
 
             <div class="panel-body">
@@ -21,10 +21,10 @@
                         <table class="table table-aa">
                             <thead>
                                 <tr>
-                                    <th>{% trans "Name" %}</th>
-                                    <th>{% trans "Description" %}</th>
-                                    <th>{% trans "Status" %}</th>
-                                    <th style="white-space: nowrap;">{% trans "Member Count" %}</th>
+                                    <th>{% translate "Name" %}</th>
+                                    <th>{% translate "Description" %}</th>
+                                    <th>{% translate "Status" %}</th>
+                                    <th style="white-space: nowrap;">{% translate "Member Count" %}</th>
                                     <th style="min-width: 170px;"></th>
                                 </tr>
                             </thead>
@@ -40,11 +40,11 @@
 
                                         <td>
                                             {% if group.authgroup.hidden %}
-                                                <span class="label label-info">{% trans "Hidden" %}</span>
+                                                <span class="label label-info">{% translate "Hidden" %}</span>
                                             {% elif group.authgroup.open %}
-                                                <span class="label label-success">{% trans "Open" %}</span>
+                                                <span class="label label-success">{% translate "Open" %}</span>
                                             {% else %}
-                                                <span class="label label-default">{% trans "Requestable" %}</span>
+                                                <span class="label label-default">{% translate "Requestable" %}</span>
                                             {% endif %}
                                         </td>
 
@@ -53,15 +53,15 @@
                                         </td>
 
                                         <td class="text-right">
-                                            <a href="{% url 'groupmanagement:membership' group.id %}" class="btn btn-primary" title="{% trans "View Members" %}">
+                                            <a href="{% url 'groupmanagement:membership' group.id %}" class="btn btn-primary" title="{% translate "View Members" %}">
                                                 <i class="glyphicon glyphicon-eye-open"></i>
                                             </a>
 
-                                            <a href="{% url "groupmanagement:audit_log" group.id %}" class="btn btn-info" title="{% trans "Audit Members" %}">
+                                            <a href="{% url "groupmanagement:audit_log" group.id %}" class="btn btn-info" title="{% translate "Audit Members" %}">
                                                 <i class="glyphicon glyphicon-list-alt"></i>
                                             </a>
 
-                                            <a id="clipboard-copy" data-clipboard-text="{{ request.scheme }}://{{request.get_host}}{% url 'groupmanagement:request_add' group.id %}" class="btn btn-warning" title="{% trans "Copy Direct Join Link" %}">
+                                            <a id="clipboard-copy" data-clipboard-text="{{ request.scheme }}://{{request.get_host}}{% url 'groupmanagement:request_add' group.id %}" class="btn btn-warning" title="{% translate "Copy Direct Join Link" %}">
                                                 <i class="glyphicon glyphicon-copy"></i>
                                             </a>
                                         </td>
@@ -72,7 +72,7 @@
                     </div>
                 {% else %}
                     <div class="alert alert-warning text-center">
-                        {% trans "No groups to list." %}
+                        {% translate "No groups to list." %}
                     </div>
                 {% endif %}
             </div>
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groups.html b/allianceauth/groupmanagement/templates/groupmanagement/groups.html
index a577402c..6ae84ce1 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/groups.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groups.html
@@ -2,18 +2,18 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "Available Groups" %}{% endblock page_title %}
+{% block page_title %}{% translate "Available Groups" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% trans "Available Groups" %}</h1>
+        <h1 class="page-header text-center">{% translate "Available Groups" %}</h1>
         {% if groups %}
             <table class="table table-aa">
                 <thead>
                     <tr>
-                        <th>{% trans "Name" %}</th>
-                        <th>{% trans "Description" %}</th>
+                        <th>{% translate "Name" %}</th>
+                        <th>{% translate "Description" %}</th>
                         <th></th>
                     </tr>
                 </thead>
@@ -27,7 +27,7 @@
                                 {% if g.group in user.groups.all %}
                                     {% if not g.request %}
                                         <a href="{% url 'groupmanagement:request_leave' g.group.id %}" class="btn btn-danger">
-                                            {% trans "Leave" %}
+                                            {% translate "Leave" %}
                                         </a>
                                     {% else %}
                                         <button type="button" class="btn btn-primary" disabled>
@@ -37,11 +37,11 @@
                                 {% elif not g.request %}
                                     {% if g.group.authgroup.open %}
                                         <a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-success">
-                                            {% trans "Join" %}
+                                            {% translate "Join" %}
                                         </a>
                                     {% else %}
                                         <a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-primary">
-                                            {% trans "Request" %}
+                                            {% translate "Request" %}
                                         </a>
                                     {% endif %}
                                 {% else %}
@@ -56,7 +56,7 @@
             </table>
         {% else %}
             <div class="alert alert-warning text-center">
-                {% trans "No groups available." %}
+                {% translate "No groups available." %}
             </div>
         {% endif %}
     </div>
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/index.html b/allianceauth/groupmanagement/templates/groupmanagement/index.html
index 51bbe9ea..a65cb776 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/index.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/index.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load evelinks %}
 
-{% block page_title %}{% trans "Groups Management" %}{% endblock page_title %}
+{% block page_title %}{% translate "Groups Management" %}{% endblock page_title %}
 
 {% block extra_css %}
     <style>
@@ -22,7 +22,7 @@
         <ul class="nav nav-tabs">
             <li class="active">
                 <a data-toggle="tab" href="#add">
-                    {% trans "Join Requests" %}
+                    {% translate "Join Requests" %}
 
                     {% if acceptrequests %}
                         <span class="badge">{{ acceptrequests|length }}</span>
@@ -31,7 +31,7 @@
             </li>
             <li>
                 <a data-toggle="tab" href="#leave">
-                    {% trans "Leave Requests" %}
+                    {% translate "Leave Requests" %}
 
                     {% if leaverequests %}
                         <span class="badge">{{ leaverequests|length }}</span>
@@ -50,9 +50,9 @@
                                 <table class="table table-aa">
                                     <thead>
                                         <tr>
-                                            <th>{% trans "Character" %}</th>
-                                            <th>{% trans "Organization" %}</th>
-                                            <th>{% trans "Group" %}</th>
+                                            <th>{% translate "Character" %}</th>
+                                            <th>{% translate "Organization" %}</th>
+                                            <th>{% translate "Group" %}</th>
                                             <th></th>
                                         </tr>
                                     </thead>
@@ -77,17 +77,17 @@
                                                         </a><br>
                                                         {{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
                                                     {% else %}
-                                                        {% trans "(unknown)" %}
+                                                        {% translate "(unknown)" %}
                                                     {% endif %}
                                                 </td>
                                                 <td>{{ acceptrequest.group.name }}</td>
                                                 <td class="text-right">
                                                     <a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
-                                                        {% trans "Accept" %}
+                                                        {% translate "Accept" %}
                                                     </a>
 
                                                     <a href="{% url 'groupmanagement:reject_request' acceptrequest.id %}" class="btn btn-danger">
-                                                        {% trans "Reject" %}
+                                                        {% translate "Reject" %}
                                                     </a>
                                                 </td>
                                             </tr>
@@ -96,7 +96,7 @@
                                 </table>
                             </div>
                         {% else %}
-                            <div class="alert alert-warning text-center">{% trans "No group add requests." %}</div>
+                            <div class="alert alert-warning text-center">{% translate "No group add requests." %}</div>
                         {% endif %}
                     </div>
 
@@ -106,9 +106,9 @@
                                 <table class="table table-aa">
                                     <thead>
                                         <tr>
-                                            <th>{% trans "Character" %}</th>
-                                            <th>{% trans "Organization" %}</th>
-                                            <th>{% trans "Group" %}</th>
+                                            <th>{% translate "Character" %}</th>
+                                            <th>{% translate "Organization" %}</th>
+                                            <th>{% translate "Group" %}</th>
                                             <th></th>
                                         </tr>
                                     </thead>
@@ -133,17 +133,17 @@
                                                         </a><br>
                                                         {{ leaverequest.main_char.alliance_name|default_if_none:"" }}
                                                     {% else %}
-                                                        {% trans "(unknown)" %}
+                                                        {% translate "(unknown)" %}
                                                     {% endif %}
                                                 </td>
                                                 <td>{{ leaverequest.group.name }}</td>
                                                 <td class="text-right">
                                                     <a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
-                                                        {% trans "Accept" %}
+                                                        {% translate "Accept" %}
                                                     </a>
 
                                                     <a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger">
-                                                        {% trans "Reject" %}
+                                                        {% translate "Reject" %}
                                                     </a>
                                                 </td>
                                             </tr>
@@ -152,7 +152,7 @@
                                 </table>
                             </div>
                         {% else %}
-                            <div class="alert alert-warning text-center">{% trans "No group leave requests." %}</div>
+                            <div class="alert alert-warning text-center">{% translate "No group leave requests." %}</div>
                         {% endif %}
                     </div>
                 </div>
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/menu.html b/allianceauth/groupmanagement/templates/groupmanagement/menu.html
index 788b987e..0f4410ed 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/menu.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/menu.html
@@ -6,21 +6,21 @@
     <div class="container-fluid">
         <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
-                <span class="sr-only">{% trans "Toggle navigation" %}</span>
+                <span class="sr-only">{% translate "Toggle navigation" %}</span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="{% url 'groupmanagement:management' %}">{% trans "Group Management" %}</a>
+            <a class="navbar-brand" href="{% url 'groupmanagement:management' %}">{% translate "Group Management" %}</a>
         </div>
 
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
             <ul class="nav navbar-nav">
                 <li class="{% navactive request 'groupmanagement:management' %}">
-                    <a href="{% url 'groupmanagement:management' %}">{% trans "Group Requests" %}</a>
+                    <a href="{% url 'groupmanagement:management' %}">{% translate "Group Requests" %}</a>
                 </li>
                 <li class="{% navactive request 'groupmanagement:membership groupmanagement:audit_log' %}">
-                    <a href="{% url 'groupmanagement:membership' %}">{% trans "Group Membership" %}</a>
+                    <a href="{% url 'groupmanagement:membership' %}">{% translate "Group Membership" %}</a>
                 </li>
             </ul>
         </div>
diff --git a/allianceauth/hrapplications/templates/hrapplications/corpchoice.html b/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
index 5db667b1..7752197a 100644
--- a/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
+++ b/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
@@ -2,13 +2,13 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "Choose a Corp" %}{% endblock page_title %}
+{% block page_title %}{% translate "Choose a Corp" %}{% endblock page_title %}
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% trans "Choose a Corp" %}</h1>
+        <h1 class="page-header text-center">{% translate "Choose a Corp" %}</h1>
         {% if choices %}
             <div class="panel panel-primary">
-                <div class="panel-heading">{% trans "Available Corps" %}</div>
+                <div class="panel-heading">{% translate "Available Corps" %}</div>
                 <table class="table table-responsive">
                     {% for choice in choices %}
                         <tr>
@@ -20,7 +20,7 @@
                 </table>
             </div>
         {% else %}
-            <div class="alert alert-danger">{% trans "No corps are accepting applications at this time." %}</div>
+            <div class="alert alert-danger">{% translate "No corps are accepting applications at this time." %}</div>
         {% endif %}
     </div>
 {% endblock content %}
diff --git a/allianceauth/hrapplications/templates/hrapplications/create.html b/allianceauth/hrapplications/templates/hrapplications/create.html
index ab4ce6ab..26bf8c66 100644
--- a/allianceauth/hrapplications/templates/hrapplications/create.html
+++ b/allianceauth/hrapplications/templates/hrapplications/create.html
@@ -2,10 +2,10 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "Apply To" %} {{ corp.corporation_name }}{% endblock page_title %}
+{% block page_title %}{% translate "Apply To" %} {{ corp.corporation_name }}{% endblock page_title %}
 {% block content %}
 <div class="col-lg-12">
-    <h1 class="page-header text-center">{% trans "Apply To" %} {{ corp.corporation_name }}</h1>
+    <h1 class="page-header text-center">{% translate "Apply To" %} {{ corp.corporation_name }}</h1>
     <div class="container-fluid">
         <div class="col-md-4 col-md-offset-4">
             <div class="row">
@@ -27,7 +27,7 @@
                         </div>
                     </div>
                     {% endfor %}
-                    <button class="btn btn-lg btn-primary btn-block" type="submit" formmethod="post">{% trans "Submit" %}</button>
+                    <button class="btn btn-lg btn-primary btn-block" type="submit" formmethod="post">{% translate "Submit" %}</button>
                 </form>
             </div>
         </div>
diff --git a/allianceauth/hrapplications/templates/hrapplications/management.html b/allianceauth/hrapplications/templates/hrapplications/management.html
index 0b62a864..adb87442 100644
--- a/allianceauth/hrapplications/templates/hrapplications/management.html
+++ b/allianceauth/hrapplications/templates/hrapplications/management.html
@@ -3,19 +3,19 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "HR Application Management" %}{% endblock page_title %}
+{% block page_title %}{% translate "HR Application Management" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% trans "Personal Applications" %}
+        <h1 class="page-header text-center">{% translate "Personal Applications" %}
             <div class="text-right">
                 {% if create %}
                     <a href="{% url 'hrapplications:create_view' %}">
-                        <button type="button" class="btn btn-success">{% trans "Create Application" %}</button>
+                        <button type="button" class="btn btn-success">{% translate "Create Application" %}</button>
                     </a>
                 {% else %}
-                    <button type="button" class="btn btn-success" disabled>{% trans "Create Application" %}</button>
+                    <button type="button" class="btn btn-success" disabled>{% translate "Create Application" %}</button>
                 {% endif %}
             </div>
         </h1>
@@ -23,10 +23,10 @@
             <div class="panel panel-default">
                 <table class="table table-condensed">
                     <tr>
-                        <th class="text-center">{% trans "Username" %}</th>
-                        <th class="text-center">{% trans "Corporation" %}
-                        <th class="text-center">{% trans "Status" %}</th>
-                        <th class="text-center">{% trans "Actions" %}</th>
+                        <th class="text-center">{% translate "Username" %}</th>
+                        <th class="text-center">{% translate "Corporation" %}
+                        <th class="text-center">{% translate "Status" %}</th>
+                        <th class="text-center">{% translate "Actions" %}</th>
                     </tr>
                     {% for personal_app in personal_apps %}
                         <tr>
@@ -34,11 +34,11 @@
                             <td class="text-center">{{ personal_app.form.corp.corporation_name }}</td>
                             <td class="text-center">
                                 {% if personal_app.approved == None %}
-                                    <div class="label label-warning">{% trans "Pending" %}</div>
+                                    <div class="label label-warning">{% translate "Pending" %}</div>
                                 {% elif  personal_app.approved == True %}
-                                    <div class="label label-success">{% trans "Approved" %}</div>
+                                    <div class="label label-success">{% translate "Approved" %}</div>
                                 {% else %}
-                                    <div class="label label-danger">{% trans "Rejected" %}</div>
+                                    <div class="label label-danger">{% translate "Rejected" %}</div>
                                 {% endif %}
                             </td>
                             <td class="text-center">
@@ -58,17 +58,17 @@
             </div>
         {% endif %}
         {% if perms.auth.human_resources %}
-            <h1 class="page-header text-center">{% trans "Application Management" %}
+            <h1 class="page-header text-center">{% translate "Application Management" %}
                 <div class="text-right">
                     <!-- Button trigger modal -->
                     <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#myModal">
-                        {% trans "Search Applications" %}
+                        {% translate "Search Applications" %}
                     </button>
                 </div>
             </h1>
             <ul class="nav nav-tabs">
-                <li class="active"><a data-toggle="tab" href="#pending">{% trans "Pending" %}</a></li>
-                <li><a data-toggle="tab" href="#reviewed">{% trans "Reviewed" %}</a></li>
+                <li class="active"><a data-toggle="tab" href="#pending">{% translate "Pending" %}</a></li>
+                <li><a data-toggle="tab" href="#reviewed">{% translate "Reviewed" %}</a></li>
             </ul>
             <div class="tab-content">
                 <div id="pending" class="tab-pane fade in active panel panel-default">
@@ -76,12 +76,12 @@
                         {% if applications %}
                             <table class="table">
                                 <tr>
-                                    <th class="text-center">{% trans "Date" %}</th>
-                                    <th class="text-center">{% trans "Username" %}</th>
-                                    <th class="text-center">{% trans "Main Character" %}</th>
-                                    <th class="text-center">{% trans "Corporation" %}</th>
-                                    <th class="text-center">{% trans "Status" %}</th>
-                                    <th class="text-center">{% trans "Actions" %}</th>
+                                    <th class="text-center">{% translate "Date" %}</th>
+                                    <th class="text-center">{% translate "Username" %}</th>
+                                    <th class="text-center">{% translate "Main Character" %}</th>
+                                    <th class="text-center">{% translate "Corporation" %}</th>
+                                    <th class="text-center">{% translate "Status" %}</th>
+                                    <th class="text-center">{% translate "Actions" %}</th>
                                 </tr>
                                 {% for app in applications %}
                                     <tr>
@@ -92,14 +92,14 @@
                                         <td class="text-center">
                                             {% if app.approved == None %}
                                                 {% if app.reviewer_str %}
-                                                    <div class="label label-info">{% trans "Reviewer:" %} {{ app.reviewer_str }}</div>
+                                                    <div class="label label-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
                                                 {% else %}
-                                                    <div class="label label-warning">{% trans "Pending" %}</div>
+                                                    <div class="label label-warning">{% translate "Pending" %}</div>
                                                 {% endif %}
                                             {% elif  app.approved == True %}
-                                                <div class="label label-success">{% trans "Approved" %}</div>
+                                                <div class="label label-success">{% translate "Approved" %}</div>
                                             {% else %}
-                                                <div class="label label-danger">{% trans "Rejected" %}</div>
+                                                <div class="label label-danger">{% translate "Rejected" %}</div>
                                             {% endif %}
                                         </td>
                                         <td class="text-center">
@@ -111,7 +111,7 @@
                                 {% endfor %}
                             </table>
                         {% else %}
-                            <div class="alert alert-warning text-center">{% trans "No pending applications." %}</div>
+                            <div class="alert alert-warning text-center">{% translate "No pending applications." %}</div>
                         {% endif %}
                     </div>
                 </div>
@@ -120,12 +120,12 @@
                         {% if finished_applications %}
                             <table class="table">
                                 <tr>
-                                    <th class="text-center">{% trans "Date" %}</th>
-                                    <th class="text-center">{% trans "Username" %}</th>
-                                    <th class="text-center">{% trans "Main Character" %}</th>
-                                    <th class="text-center">{% trans "Corporation" %}</th>
-                                    <th class="text-center">{% trans "Status" %}</th>
-                                    <th class="text-center">{% trans "Actions" %}</th>
+                                    <th class="text-center">{% translate "Date" %}</th>
+                                    <th class="text-center">{% translate "Username" %}</th>
+                                    <th class="text-center">{% translate "Main Character" %}</th>
+                                    <th class="text-center">{% translate "Corporation" %}</th>
+                                    <th class="text-center">{% translate "Status" %}</th>
+                                    <th class="text-center">{% translate "Actions" %}</th>
                                 </tr>
                                 {% for app in finished_applications %}
                                     <tr>
@@ -136,14 +136,14 @@
                                         <td class="text-center">
                                             {% if app.approved == None %}
                                                 {% if app.reviewer_str %}
-                                                    <div class="label label-info">{% trans "Reviewer:" %} {{ app.reviewer_str }}</div>
+                                                    <div class="label label-info">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
                                                 {% else %}
-                                                    <div class="label label-warning">{% trans "Pending" %}</div>
+                                                    <div class="label label-warning">{% translate "Pending" %}</div>
                                                 {% endif %}
                                             {% elif  app.approved == True %}
-                                                <div class="label label-success">{% trans "Approved" %}</div>
+                                                <div class="label label-success">{% translate "Approved" %}</div>
                                             {% else %}
-                                                <div class="label label-danger">{% trans "Rejected" %}</div>
+                                                <div class="label label-danger">{% translate "Rejected" %}</div>
                                             {% endif %}
                                         </td>
                                         <td class="text-center">
@@ -160,7 +160,7 @@
                                 {% endfor %}
                             </table>
                         {% else %}
-                            <div class="alert alert-warning text-center">{% trans "No reviewed applications." %}</div>
+                            <div class="alert alert-warning text-center">{% translate "No reviewed applications." %}</div>
                         {% endif %}
                     </div>
                 </div>
@@ -174,15 +174,15 @@
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{% trans "Close" %}</span></button>
-                        <h4 class="modal-title" id="myModalLabel">{% trans "Application Search" %}</h4>
+                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{% translate "Close" %}</span></button>
+                        <h4 class="modal-title" id="myModalLabel">{% translate "Application Search" %}</h4>
                     </div>
                     <div class="modal-body">
                         <form class="form-signin" role="form" action={% url 'hrapplications:search' %} method="POST">
                             {% csrf_token %}
                             {{ search_form|bootstrap }}
                             <br/>
-                            <button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Search" %}</button>
+                            <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Search" %}</button>
                         </form>
                     </div>
                     <div class="modal-footer">
diff --git a/allianceauth/hrapplications/templates/hrapplications/searchview.html b/allianceauth/hrapplications/templates/hrapplications/searchview.html
index 3fc5a8c2..002aed6b 100644
--- a/allianceauth/hrapplications/templates/hrapplications/searchview.html
+++ b/allianceauth/hrapplications/templates/hrapplications/searchview.html
@@ -9,23 +9,23 @@
 {% block content %}
     <div class="col-lg-12">
         {% if perms.auth.human_resources %}
-            <h1 class="page-header text-center">{% trans "Application Search Results" %}
+            <h1 class="page-header text-center">{% translate "Application Search Results" %}
                 <div class="text-right">
                     <!-- Button trigger modal -->
                     <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#myModal">
-                        {% trans "Search Applications" %}
+                        {% translate "Search Applications" %}
                     </button>
                 </div>
             </h1>
             <div class="container-fluid">
                 <table class="table table-bordered">
                     <tr>
-                        <th class="text-center">{% trans "Application ID" %}</th>
-                        <th class="text-center">{% trans "Username" %}</th>
-                        <th class="text-center">{% trans "Main Character" %}</th>
-                        <th class="text-center">{% trans "Corporation" %}</th>
-                        <th class="text-center">{% trans "Status" %}</th>
-                        <th class="text-center">{% trans "Actions" %}</th>
+                        <th class="text-center">{% translate "Application ID" %}</th>
+                        <th class="text-center">{% translate "Username" %}</th>
+                        <th class="text-center">{% translate "Main Character" %}</th>
+                        <th class="text-center">{% translate "Corporation" %}</th>
+                        <th class="text-center">{% translate "Status" %}</th>
+                        <th class="text-center">{% translate "Actions" %}</th>
                     </tr>
                     {% for app in applications %}
                         <tr>
@@ -35,11 +35,11 @@
                             <td class="text-center">{{ app.form.corp }}</td>
                             <td class="text-center">
                                 {% if app.approved == None %}
-                                    <div class="label label-warning">{% trans "Pending" %}</div>
+                                    <div class="label label-warning">{% translate "Pending" %}</div>
                                 {% elif  app.approved == True %}
-                                    <div class="label label-success">{% trans "Approved" %}</div>
+                                    <div class="label label-success">{% translate "Approved" %}</div>
                                 {% else %}
-                                    <div class="label label-danger">{% trans "Rejected" %}</div>
+                                    <div class="label label-danger">{% translate "Rejected" %}</div>
                                 {% endif %}
                             </td>
                             <td class="text-center">
@@ -60,15 +60,15 @@
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{% trans "Close" %}</span></button>
-                        <h4 class="modal-title" id="myModalLabel">{% trans "Application Search" %}</h4>
+                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{% translate "Close" %}</span></button>
+                        <h4 class="modal-title" id="myModalLabel">{% translate "Application Search" %}</h4>
                     </div>
                     <div class="modal-body">
                         <form class="form-signin" role="form" action={% url 'hrapplications:search' %} method="POST">
                             {% csrf_token %}
                             {{ search_form|bootstrap }}
                             <br/>
-                            <button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Search" %}</button>
+                            <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Search" %}</button>
                         </form>
                     </div>
                     <div class="modal-footer">
diff --git a/allianceauth/hrapplications/templates/hrapplications/view.html b/allianceauth/hrapplications/templates/hrapplications/view.html
index 6b27f632..5f3b8526 100644
--- a/allianceauth/hrapplications/templates/hrapplications/view.html
+++ b/allianceauth/hrapplications/templates/hrapplications/view.html
@@ -3,33 +3,33 @@
 {% load bootstrap %}
 {% load i18n %}
 
-{% block page_title %}{% trans "View Application" %}{% endblock page_title %}
+{% block page_title %}{% translate "View Application" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% trans "View Application" %}</h1>
+        <h1 class="page-header text-center">{% translate "View Application" %}</h1>
         <div class="container-fluid">
             <div class="col-md-6 col-md-offset-3">
                 <div class="row">
                     {% if app.approved %}
-                        <div class="alert alert-success text-center">{% trans "Approved" %}</div>
+                        <div class="alert alert-success text-center">{% translate "Approved" %}</div>
                     {% elif app.approved == False %}
-                        <div class="alert alert-danger text-center">{% trans "Denied" %}</div>
+                        <div class="alert alert-danger text-center">{% translate "Denied" %}</div>
                     {% else %}
-                        <div class="alert alert-warning text-center">{% trans "Pending" %}</div>
+                        <div class="alert alert-warning text-center">{% translate "Pending" %}</div>
                     {% endif %}
                     {% if app.reviewer_str %}
-                        <div class="alert alert-info text-center">{% trans "Reviewer:" %} {{ app.reviewer_str }}</div>
+                        <div class="alert alert-info text-center">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
                     {% endif %}
                 </div>
                 <div class="row">
                     <div class="panel panel-info">
-                        <div class="panel-heading">{% trans "Applicant" %}</div>
+                        <div class="panel-heading">{% translate "Applicant" %}</div>
                         <table class="table">
                             <tr>
-                                <th class="text-center">{% trans "User" %}</th>
-                                <th class="text-center">{% trans "Main Character" %}</th>
+                                <th class="text-center">{% translate "User" %}</th>
+                                <th class="text-center">{% translate "Main Character" %}</th>
                             </tr>
                             <tr>
                                 <td class="text-center">{{ app.user }}</td>
@@ -38,13 +38,13 @@
                         </table>
                     </div>
                     <div class="panel panel-info">
-                        <div class="panel-heading">{% trans "Characters" %}</div>
+                        <div class="panel-heading">{% translate "Characters" %}</div>
                         <table class="table">
                             <tr>
                                 <th class="text-center"></th>
-                                <th class="text-center">{% trans "Name" %}</th>
-                                <th class="text-center">{% trans "Corp" %}</th>
-                                <th class="text-center">{% trans "Alliance" %}</th>
+                                <th class="text-center">{% translate "Name" %}</th>
+                                <th class="text-center">{% translate "Corp" %}</th>
+                                <th class="text-center">{% translate "Alliance" %}</th>
                             </tr>
                             {% for char in app.characters %}
                                 <tr>
@@ -71,25 +71,25 @@
                     {% if perms.auth.human_resources %}
                         <div class="row">
                             <div class="panel panel-primary">
-                                <div class="panel-heading">{% trans "Actions" %}</div>
+                                <div class="panel-heading">{% translate "Actions" %}</div>
                                 <div class="panel-body text-center">
                                     {% if app.approved == None %}
                                         {% if app.reviewer == user %}
                                             {% if perms.hrapplications.approve_application %}
-                                                <a href="{% url 'hrapplications:approve' app.id %}" class="btn btn-success">{% trans "Approve" %}</a>
+                                                <a href="{% url 'hrapplications:approve' app.id %}" class="btn btn-success">{% translate "Approve" %}</a>
                                             {% endif %}
                                             {% if perms.hrapplications.reject_application %}
-                                                <a href="{% url 'hrapplications:reject' app.id %}" class="btn btn-danger">{% trans "Reject" %}</a>
+                                                <a href="{% url 'hrapplications:reject' app.id %}" class="btn btn-danger">{% translate "Reject" %}</a>
                                             {% endif %}
                                             {% if perms.hrapplications.delete_application %}
-                                                <a href="{% url 'hrapplications:remove' app.id %}" class="btn btn-danger">{% trans "Delete" %}</a>
+                                                <a href="{% url 'hrapplications:remove' app.id %}" class="btn btn-danger">{% translate "Delete" %}</a>
                                             {% endif %}
                                         {% elif not app.reviewer %}
-                                            <a href="{% url 'hrapplications:mark_in_progress' app.id %}" class="btn btn-warning">{% trans "Mark in Progress" %}</a>
+                                            <a href="{% url 'hrapplications:mark_in_progress' app.id %}" class="btn btn-warning">{% translate "Mark in Progress" %}</a>
                                         {% endif %}
                                     {% endif %}
                                     {% if perms.hrapplications.add_applicationcomment %}
-                                        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal">{% trans "Comment" %}</button>
+                                        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal">{% translate "Comment" %}</button>
                                     {% endif %}
                                 </div>
                             </div>
@@ -99,7 +99,7 @@
                                 <div class="panel-heading" role="tab" id="headingThree">
                                     <h4 class="panel-title">
                                         <a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
-                                            {% trans 'Comments' %} ({{ comments.count }})
+                                            {% translate 'Comments' %} ({{ comments.count }})
                                         </a>
                                     </h4>
                                 </div>
@@ -132,16 +132,16 @@
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal">
-                            <span aria-hidden="true">&times;</span><span class="sr-only">{% trans "Close" %}</span>
+                            <span aria-hidden="true">&times;</span><span class="sr-only">{% translate "Close" %}</span>
                         </button>
-                        <h4 class="modal-title" id="myModalLabel">{% trans "Add Comment" %}</h4>
+                        <h4 class="modal-title" id="myModalLabel">{% translate "Add Comment" %}</h4>
                     </div>
                     <div class="modal-body">
                         <form class="form-signin" role="form" action="" method="POST">
                             {% csrf_token %}
                             {{ comment_form|bootstrap }}
                             <br/>
-                            <button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Add Comment" %}</button>
+                            <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Add Comment" %}</button>
                         </form>
                     </div>
                     <div class="modal-footer"></div>
diff --git a/allianceauth/notifications/templates/notifications/list.html b/allianceauth/notifications/templates/notifications/list.html
index 3f13cc72..f940bac1 100644
--- a/allianceauth/notifications/templates/notifications/list.html
+++ b/allianceauth/notifications/templates/notifications/list.html
@@ -2,24 +2,24 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "Notifications" %}{% endblock %}
+{% block page_title %}{% translate "Notifications" %}{% endblock %}
 
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% trans "Notifications" %}</h1>
+        <h1 class="page-header text-center">{% translate "Notifications" %}</h1>
         <div class="col-lg-12 container" id="example">
             <div class="row">
                 <div class="col-lg-12">
                     <div class="panel panel-default">
                         <div class="panel-heading">
                             <ul class="nav nav-pills">
-                                <li class="active"><a data-toggle="pill" href="#unread">{% trans "Unread" %}
+                                <li class="active"><a data-toggle="pill" href="#unread">{% translate "Unread" %}
                                     <b>({{ unread|length }})</b></a></li>
-                                <li><a data-toggle="pill" href="#read">{% trans "Read" %} <b>({{ read|length }})</b></a>
+                                <li><a data-toggle="pill" href="#read">{% translate "Read" %} <b>({{ read|length }})</b></a>
                                 </li>
                                 <div class="pull-right">
-                                    <a href="{% url 'notifications:mark_all_read' %}" class="btn btn-primary">{% trans "Mark All Read" %}</a>
-                                    <a href="{% url 'notifications:delete_all_read' %}" class="btn btn-danger">{% trans "Delete All Read" %}</a>
+                                    <a href="{% url 'notifications:mark_all_read' %}" class="btn btn-primary">{% translate "Mark All Read" %}</a>
+                                    <a href="{% url 'notifications:delete_all_read' %}" class="btn btn-danger">{% translate "Delete All Read" %}</a>
                                 </div>
                             </ul>
                         </div>
@@ -30,9 +30,9 @@
                                         {% if unread %}
                                             <table class="table table-condensed table-hover table-striped">
                                                 <tr>
-                                                    <th class="text-center">{% trans "Timestamp" %}</th>
-                                                    <th class="text-center">{% trans "Title" %}</th>
-                                                    <th class="text-center">{% trans "Action" %}</th>
+                                                    <th class="text-center">{% translate "Timestamp" %}</th>
+                                                    <th class="text-center">{% translate "Title" %}</th>
+                                                    <th class="text-center">{% translate "Action" %}</th>
                                                 </tr>
                                                 {% for notif in unread %}
                                                     <tr class="{{ notif.level }}">
@@ -50,7 +50,7 @@
                                                 {% endfor %}
                                             </table>
                                         {% else %}
-                                            <div class="alert alert-warning text-center">{% trans "No unread notifications." %}</div>
+                                            <div class="alert alert-warning text-center">{% translate "No unread notifications." %}</div>
                                         {% endif %}
                                     </div>
                                 </div>
@@ -60,9 +60,9 @@
                                             {% if read %}
                                                 <table class="table table-condensed table-hover table-striped">
                                                     <tr>
-                                                        <th class="text-center">{% trans "Timestamp" %}</th>
-                                                        <th class="text-center">{% trans "Title" %}</th>
-                                                        <th class="text-center">{% trans "Action" %}</th>
+                                                        <th class="text-center">{% translate "Timestamp" %}</th>
+                                                        <th class="text-center">{% translate "Title" %}</th>
+                                                        <th class="text-center">{% translate "Action" %}</th>
                                                     </tr>
                                                     {% for notif in read %}
                                                         <tr class="{{ notif.level }}">
@@ -80,7 +80,7 @@
                                                     {% endfor %}
                                                 </table>
                                             {% else %}
-                                                <div class="alert alert-warning text-center">{% trans "No read notifications." %}</div>
+                                                <div class="alert alert-warning text-center">{% translate "No read notifications." %}</div>
                                             {% endif %}
                                         </div>
                                     </div>
diff --git a/allianceauth/notifications/templates/notifications/view.html b/allianceauth/notifications/templates/notifications/view.html
index 1c03f086..c09257ef 100644
--- a/allianceauth/notifications/templates/notifications/view.html
+++ b/allianceauth/notifications/templates/notifications/view.html
@@ -2,13 +2,13 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "View Notification" %}{% endblock page_title %}
+{% block page_title %}{% translate "View Notification" %}{% endblock page_title %}
 
 {% block content %}
 
     <div class="col-lg-12">
         <h1 class="page-header text-center">
-            {% trans "View Notification" %}
+            {% translate "View Notification" %}
             <div class="text-right">
                 <a href="{% url 'notifications:list' %}" class="btn btn-primary btn-lg">
                     <span class="glyphicon glyphicon-arrow-left"></span>
diff --git a/allianceauth/optimer/templates/optimer/add.html b/allianceauth/optimer/templates/optimer/add.html
index 1d837db5..84e1b694 100644
--- a/allianceauth/optimer/templates/optimer/add.html
+++ b/allianceauth/optimer/templates/optimer/add.html
@@ -4,14 +4,14 @@
 {% load i18n %}
 {% get_current_language as LANGUAGE_CODE %}
 
-{% block page_title %}{% trans "Create Operation" %}{% endblock page_title %}
+{% block page_title %}{% translate "Create Operation" %}{% endblock page_title %}
 {% block extra_css %}
     {% include 'bundles/jquery-datetimepicker-css.html' %}
 {% endblock extra_css %}
 
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% trans "Create Fleet Operation" %}</h1>
+        <h1 class="page-header text-center">{% translate "Create Fleet Operation" %}</h1>
 
         <div class="container-fluid">
             <div class="col-md-4 col-md-offset-4">
@@ -20,7 +20,7 @@
                             {% csrf_token %}
                             {{ form|bootstrap }}
                             <br/>
-                            <button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Create Fleet Operation" %}</button>
+                            <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Create Fleet Operation" %}</button>
                         </form>
                 </div>
             </div>
diff --git a/allianceauth/optimer/templates/optimer/fleetoptable.html b/allianceauth/optimer/templates/optimer/fleetoptable.html
index 2ad12f59..f95099dc 100644
--- a/allianceauth/optimer/templates/optimer/fleetoptable.html
+++ b/allianceauth/optimer/templates/optimer/fleetoptable.html
@@ -6,16 +6,16 @@
         <table class="table">
             <thead>
                 <tr>
-                    <th class="text-center col-lg-3">{% trans "Operation Name" %}</th>
-                    <th class="text-center col lg-2">{% trans "Doctrine" %}</th>
-                    <th class="text-center col-lg-1">{% trans "Form Up System" %}</th>
-                    <th class="text-center col-lg-1">{% trans "Start Time" %}</th>
-                    <th class="text-center col-lg-1">{% trans "Local Time" %}</th>
-                    <th class="text-center col-lg-1">{% trans "Duration" %}</th>
-                    <th class="text-center col-lg-1">{% trans "FC" %}</th>
+                    <th class="text-center col-lg-3">{% translate "Operation Name" %}</th>
+                    <th class="text-center col lg-2">{% translate "Doctrine" %}</th>
+                    <th class="text-center col-lg-1">{% translate "Form Up System" %}</th>
+                    <th class="text-center col-lg-1">{% translate "Start Time" %}</th>
+                    <th class="text-center col-lg-1">{% translate "Local Time" %}</th>
+                    <th class="text-center col-lg-1">{% translate "Duration" %}</th>
+                    <th class="text-center col-lg-1">{% translate "FC" %}</th>
                     {% if perms.auth.optimer_management %}
-                    <th class="text-center col-lg-1">{% trans "Creator" %}</th>
-                    <th class="text-center col-lg-2">{% trans "Action" %}</th>
+                    <th class="text-center col-lg-1">{% translate "Creator" %}</th>
+                    <th class="text-center col-lg-2">{% translate "Action" %}</th>
                     {% endif %}
                 </tr>
             </thead>
diff --git a/allianceauth/optimer/templates/optimer/management.html b/allianceauth/optimer/templates/optimer/management.html
index 583b3e22..d93b2588 100644
--- a/allianceauth/optimer/templates/optimer/management.html
+++ b/allianceauth/optimer/templates/optimer/management.html
@@ -3,39 +3,39 @@
 {% load i18n %}
 {% get_current_language as LANGUAGE_CODE %}
 
-{% block page_title %}{% trans "Fleet Operation Management" %}{% endblock page_title %}
+{% block page_title %}{% translate "Fleet Operation Management" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% trans "Fleet Operation Timers" %}
+        <h1 class="page-header text-center">{% translate "Fleet Operation Timers" %}
             <div class="text-right">
                 {% if perms.auth.optimer_management %}
-                    <a href="{% url 'optimer:add' %}" class="btn btn-success">{% trans "Create Operation" %}</a>
+                    <a href="{% url 'optimer:add' %}" class="btn btn-success">{% translate "Create Operation" %}</a>
                 {% endif %}
             </div>
         </h1>
 
         <div class="col-lg-12 text-center row">
             <div class="label label-info text-left">
-                <b>{% trans "Current Eve Time:" %} </b>
+                <b>{% translate "Current Eve Time:" %} </b>
             </div>
             <strong class="label label-info text-left" id="current-time"></strong>
             <br  />
         </div>
 
-        <h4><b>{% trans "Next Timers" %}</b></h4>
+        <h4><b>{% translate "Next Timers" %}</b></h4>
         {% if future_timers %}
             {% include "optimer/fleetoptable.html" with timers=future_timers %}
         {% else %}
-            <div class="alert alert-warning text-center">{% trans "No upcoming timers." %}</div>
+            <div class="alert alert-warning text-center">{% translate "No upcoming timers." %}</div>
         {% endif %}
 
-        <h4><b>{% trans "Past Timers" %}</b></h4>
+        <h4><b>{% translate "Past Timers" %}</b></h4>
         {% if past_timers %}
             {% include "optimer/fleetoptable.html" with timers=past_timers %}
         {% else %}
-            <div class="alert alert-warning text-center">{% trans "No past timers." %}</div>
+            <div class="alert alert-warning text-center">{% translate "No past timers." %}</div>
         {% endif %}
     </div>
 
diff --git a/allianceauth/optimer/templates/optimer/update.html b/allianceauth/optimer/templates/optimer/update.html
index a93b98f1..7eb46577 100644
--- a/allianceauth/optimer/templates/optimer/update.html
+++ b/allianceauth/optimer/templates/optimer/update.html
@@ -4,7 +4,7 @@
 {% load i18n %}
 {% get_current_language as LANGUAGE_CODE %}
 
-{% block page_title %}{% trans "Update Fleet Operation" %}{% endblock page_title %}
+{% block page_title %}{% translate "Update Fleet Operation" %}{% endblock page_title %}
 
 {% block extra_css %}
     {% include 'bundles/jquery-datetimepicker-css.html' %}
@@ -13,19 +13,19 @@
 {% block content %}
 
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% trans "Update Fleet Operation" %}</h1>
+        <h1 class="page-header text-center">{% translate "Update Fleet Operation" %}</h1>
 
         <div class="container-fluid">
             <div class="col-md-4 col-md-offset-4">
                 <div class="row">
                     {% if no_fleet_id %}
-                        <div class="alert alert-danger" role="alert">{% trans "Fleet Operation Does Not Exist" %}</div>
+                        <div class="alert alert-danger" role="alert">{% translate "Fleet Operation Does Not Exist" %}</div>
                     {% else %}
                         <form class="form-signin" role="form" action="" method="POST">
                             {% csrf_token %}
                             {{ form|bootstrap }}
                             <br/>
-                            <button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Update Fleet Operation" %}
+                            <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Update Fleet Operation" %}
                             </button>
                         </form>
                     {% endif %}
diff --git a/allianceauth/permissions_tool/templates/permissions_tool/audit.html b/allianceauth/permissions_tool/templates/permissions_tool/audit.html
index f1053ca0..f168e74d 100644
--- a/allianceauth/permissions_tool/templates/permissions_tool/audit.html
+++ b/allianceauth/permissions_tool/templates/permissions_tool/audit.html
@@ -3,24 +3,24 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{{ permission.permission.codename }} - {% trans "Permissions Audit" %}{% endblock page_title %}
+{% block page_title %}{{ permission.permission.codename }} - {% translate "Permissions Audit" %}{% endblock page_title %}
 
 {% block content %}
     <div>
-        <h1 class="page-header">{% trans "Permissions Audit" %}: {{ permission.permission.codename }}</h1>
+        <h1 class="page-header">{% translate "Permissions Audit" %}: {{ permission.permission.codename }}</h1>
         <p>
             <a href="{% url 'permissions_tool:overview' %}" class="btn btn-default">
-                <i class="glyphicon glyphicon-chevron-left"></i> {% trans "Back" %}
+                <i class="glyphicon glyphicon-chevron-left"></i> {% translate "Back" %}
             </a>
         </p>
         <div class="table-responsive">
             <table class="table table-striped" id="tab_permissions_audit">
                 <thead>
                     <tr>
-                        <th>{% trans "Group" %}</th>
+                        <th>{% translate "Group" %}</th>
                         <th></th>
-                        <th>{% trans "User / Character" %}</th>
-                        <th>{% trans "Organization" %}</th>
+                        <th>{% translate "User / Character" %}</th>
+                        <th>{% translate "Organization" %}</th>
                     </tr>
                 </thead>
                 <tbody>
diff --git a/allianceauth/permissions_tool/templates/permissions_tool/overview.html b/allianceauth/permissions_tool/templates/permissions_tool/overview.html
index 8ad0e6a1..637e53a4 100644
--- a/allianceauth/permissions_tool/templates/permissions_tool/overview.html
+++ b/allianceauth/permissions_tool/templates/permissions_tool/overview.html
@@ -3,18 +3,18 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "Permissions Overview" %}{% endblock page_title %}
+{% block page_title %}{% translate "Permissions Overview" %}{% endblock page_title %}
 
 {% block content %}
     <div class="col-sm-12">
-        <h1 class="page-header">{% trans "Permissions Overview" %}</h1>
+        <h1 class="page-header">{% translate "Permissions Overview" %}</h1>
         <p>
         {% if request.GET.all != 'yes' %}
             {% blocktrans %}Showing only applied permissions{% endblocktrans %}
-            <a href="{% url 'permissions_tool:overview' %}?all=yes" class="btn btn-primary">{% trans "Show All" %}</a>
+            <a href="{% url 'permissions_tool:overview' %}?all=yes" class="btn btn-primary">{% translate "Show All" %}</a>
         {% else %}
             {% blocktrans %}Showing all permissions{% endblocktrans %}
-            <a href="{% url 'permissions_tool:overview' %}?all=no" class="btn btn-primary">{% trans "Show Applied" %}</a>
+            <a href="{% url 'permissions_tool:overview' %}?all=no" class="btn btn-primary">{% translate "Show Applied" %}</a>
         {% endif %}
         </p>
         <div class="table-responsive">
@@ -22,25 +22,25 @@
                 <thead>
                     <tr>
                         <th>
-                            {% trans "App" %}
+                            {% translate "App" %}
                         </th>
                         <th>
-                            {% trans "Model" %}
+                            {% translate "Model" %}
                         </th>
                         <th>
-                            {% trans "Code Name" %}
+                            {% translate "Code Name" %}
                         </th>
                         <th>
-                            {% trans "Name" %}
+                            {% translate "Name" %}
                         </th>
                         <th class="col-md-1">
-                            {% trans "Users" %}
+                            {% translate "Users" %}
                         </th>
                         <th class="col-md-1">
-                            {% trans "Groups" %}
+                            {% translate "Groups" %}
                         </th>
                         <th class="col-md-1">
-                            {% trans "States" %}
+                            {% translate "States" %}
                         </th>
                     </tr>
                 </thead>
diff --git a/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html b/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html
index d5e07420..3a945885 100644
--- a/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html
+++ b/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html
@@ -15,21 +15,21 @@
     </td>
     <td class="text-center">
         {% if not user_has_account %}
-            <a href="{% url 'discord:activate' %}" title="{% trans 'Join the Discord server' %}" class="btn btn-primary">
+            <a href="{% url 'discord:activate' %}" title="{% translate 'Join the Discord server' %}" class="btn btn-primary">
                 <span class="glyphicon glyphicon-ok"></span>
             </a>
         {% else %}
-            <a href="{% url 'discord:reset' %}" title="{% trans 'Leave- and rejoin the Discord Server (Reset)' %}" class="btn btn-warning">
+            <a href="{% url 'discord:reset' %}" title="{% translate 'Leave- and rejoin the Discord Server (Reset)' %}" class="btn btn-warning">
                 <span class="glyphicon glyphicon-refresh"></span>
             </a>
-            <a href="{% url 'discord:deactivate' %}" title="{% trans 'Leave the Discord server' %}" class="btn btn-danger">
+            <a href="{% url 'discord:deactivate' %}" title="{% translate 'Leave the Discord server' %}" class="btn btn-danger">
                 <span class="glyphicon glyphicon-remove"></span>
             </a>
         {% endif %}
         {% if request.user.is_superuser %}
             <div class="text-center" style="padding-top:5px;">
                 <a type="button" id="btnLinkDiscordServer" class="btn btn-default" href="{% url 'discord:add_bot' %}">
-                    {% trans "Link Discord Server" %}
+                    {% translate "Link Discord Server" %}
                 </a>
             </div>
         {% endif %}
diff --git a/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html b/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html
index 3e87fe20..519cbd49 100755
--- a/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html
+++ b/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html
@@ -3,24 +3,24 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "Jabber Broadcast" %}{% endblock page_title %}
+{% block page_title %}{% translate "Jabber Broadcast" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% trans "Jabber Broadcast" %}</h1>
+        <h1 class="page-header text-center">{% translate "Jabber Broadcast" %}</h1>
 
         <div class="container-fluid">
             <div class="col-md-4 col-md-offset-4">
                 <div class="row">
                     {% if success %}
-                        <div class="alert alert-success" role="alert">{% trans "Broadcast Sent!!" %}</div>
+                        <div class="alert alert-success" role="alert">{% translate "Broadcast Sent!!" %}</div>
                     {% endif %}
                     <form class="form-signin" role="form" action="" method="POST" onsubmit="submitbutton.disabled = true; return true;">
                         {% csrf_token %}
                         {{ form|bootstrap }}
                         <br/>
-                        <button class="btn btn-lg btn-primary btn-block" name="submitbutton" type="submit">{% trans "Broadcast" %}
+                        <button class="btn btn-lg btn-primary btn-block" name="submitbutton" type="submit">{% translate "Broadcast" %}
                         </button>
                     </form>
                 </div>
diff --git a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
index b4984045..64c16339 100644
--- a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
+++ b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
@@ -3,21 +3,21 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "Verify Teamspeak" %}{% endblock page_title %}
+{% block page_title %}{% translate "Verify Teamspeak" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% trans "Verify Teamspeak Identity" %}</h1>
+        <h1 class="page-header text-center">{% translate "Verify Teamspeak Identity" %}</h1>
         <div class="container-fluid">
             <div class="col-md-4 col-md-offset-4">
-                <a href="ts3server://{{ public_url }}?token={{ authinfo.teamspeak3_perm_key }}&nickname={{ authinfo.teamspeak3_uid }}" class="btn btn-primary btn-block btn-lg" title="Join">{% trans "Join Server" %}</a>
+                <a href="ts3server://{{ public_url }}?token={{ authinfo.teamspeak3_perm_key }}&nickname={{ authinfo.teamspeak3_uid }}" class="btn btn-primary btn-block btn-lg" title="Join">{% translate "Join Server" %}</a>
                 <br/>
                 <form class="form-signin" role="form" action="{% url 'teamspeak3:verify' %}" method="POST">
                     {% csrf_token %}
                     {{ form|bootstrap }}
                     <br/>
-                    <button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Continue" %}</button>
+                    <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Continue" %}</button>
                 </form>
                 </div>
         </div>
diff --git a/allianceauth/services/templates/public/menuitem.html b/allianceauth/services/templates/public/menuitem.html
index 6dad1664..6a758db7 100644
--- a/allianceauth/services/templates/public/menuitem.html
+++ b/allianceauth/services/templates/public/menuitem.html
@@ -3,7 +3,7 @@
 
 <li>
     <a class="{% navactive request item.navactive|join:' ' %}" href="{% url item.url_name %}">
-        <i class="{{ item.classes }}"></i> {% trans item.text %}
+        <i class="{{ item.classes }}"></i> {% translate item.text %}
         {% if item.count != None %}
             <span class="badge">{{ item.count }}</span>
         {% endif %}
diff --git a/allianceauth/services/templates/services/fleetformattertool.html b/allianceauth/services/templates/services/fleetformattertool.html
index 32713680..9827c9b2 100644
--- a/allianceauth/services/templates/services/fleetformattertool.html
+++ b/allianceauth/services/templates/services/fleetformattertool.html
@@ -3,12 +3,12 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "Fleet Formatter Tool" %}{% endblock page_title %}
+{% block page_title %}{% translate "Fleet Formatter Tool" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% trans "Fleet Broadcast Formatter Tool" %}</h1>
+        <h1 class="page-header text-center">{% translate "Fleet Broadcast Formatter Tool" %}</h1>
 
         <div class="container-fluid">
             <div class="col-md-6 col-md-offset-3">
@@ -21,7 +21,7 @@
                         {% csrf_token %}
                         {{ form|bootstrap }}
                         <br/>
-                        <button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Format" %}</button>
+                        <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Format" %}</button>
                         <br/>
                     </form>
                 </div>
diff --git a/allianceauth/services/templates/services/service_credentials.html b/allianceauth/services/templates/services/service_credentials.html
index d18ad4da..7c903046 100644
--- a/allianceauth/services/templates/services/service_credentials.html
+++ b/allianceauth/services/templates/services/service_credentials.html
@@ -17,7 +17,7 @@
                         </div>
                     {% endfor %}
                 </form>
-                <a href="{% url 'services:services' %}" class="btn btn-lg btn-block btn-primary" title="Continue">{% trans "Continue" %}</a>
+                <a href="{% url 'services:services' %}" class="btn btn-lg btn-block btn-primary" title="Continue">{% translate "Continue" %}</a>
             </div>
         </div>
     </div>
diff --git a/allianceauth/services/templates/services/service_password.html b/allianceauth/services/templates/services/service_password.html
index 16c56eb7..481fc25b 100644
--- a/allianceauth/services/templates/services/service_password.html
+++ b/allianceauth/services/templates/services/service_password.html
@@ -15,7 +15,7 @@
                         {% csrf_token %}
                         {{ form|bootstrap }}
                         <br/>
-                        <button class="btn btn-lg btn-primary btn-block" name="submitbutton" type="submit">{% trans "Set Password" %}</button>
+                        <button class="btn btn-lg btn-primary btn-block" name="submitbutton" type="submit">{% translate "Set Password" %}</button>
                     </form>
                 </div>
             </div>
diff --git a/allianceauth/services/templates/services/services.html b/allianceauth/services/templates/services/services.html
index cf36b033..7d89223e 100755
--- a/allianceauth/services/templates/services/services.html
+++ b/allianceauth/services/templates/services/services.html
@@ -2,20 +2,20 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "Services Management" %}{% endblock page_title %}
+{% block page_title %}{% translate "Services Management" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
     <div class="col-lg-12">
-    <h1 class="page-header text-center">{% trans "Available Services" %}</h1>
+    <h1 class="page-header text-center">{% translate "Available Services" %}</h1>
         <div class="table-responsive">
             <table class="table table-striped">
                 <thead>
                     <tr>
-                        <th class="text-center">{% trans "Service" %}</th>
-                        <th class="text-center">{% trans "Username" %}</th>
-                        <th class="text-center">{% trans "Domain" %}</th>
-                        <th class="text-center">{% trans "Action" %}</th>
+                        <th class="text-center">{% translate "Service" %}</th>
+                        <th class="text-center">{% translate "Username" %}</th>
+                        <th class="text-center">{% translate "Domain" %}</th>
+                        <th class="text-center">{% translate "Action" %}</th>
                     </tr>
                 </thead>
                 <tbody>
diff --git a/allianceauth/srp/templates/srp/add.html b/allianceauth/srp/templates/srp/add.html
index d913b63c..95646b9b 100644
--- a/allianceauth/srp/templates/srp/add.html
+++ b/allianceauth/srp/templates/srp/add.html
@@ -3,7 +3,7 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "SRP Fleet Create" %}{% endblock page_title %}
+{% block page_title %}{% translate "SRP Fleet Create" %}{% endblock page_title %}
 {% block extra_css %}
     {% include 'bundles/jquery-datetimepicker-css.html' %}
 {% endblock extra_css %}
@@ -11,7 +11,7 @@
 {% block content %}
 
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% trans "Create SRP Fleet" %}</h1>
+        <h1 class="page-header text-center">{% translate "Create SRP Fleet" %}</h1>
 
         <div class="container-fluid">
             <div class="col-md-4 col-md-offset-4">
@@ -21,14 +21,14 @@
                             {% csrf_token %}
                             {{ form|bootstrap }}
                             <br/>
-                            <button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Create SRP Fleet" %}</button>
+                            <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Create SRP Fleet" %}</button>
                         </form>
                     {% else %}
                         <div class="alert alert-info" role="alert">{% blocktrans %}Give this link to the line members{% endblocktrans %}.</div>
                         <div class="alert alert-info" role="alert">
                             {{ request.scheme }}://{{ request.get_host }}{% url 'srp:request' completed_srp_code %}</div>
                         <div class="text-center">
-                            <a href="{% url 'srp:management' %}" class="btn btn-primary btn-lg">{% trans "Continue" %}</a>
+                            <a href="{% url 'srp:management' %}" class="btn btn-primary btn-lg">{% translate "Continue" %}</a>
                         </div>
                     {% endif %}
                 </div>
diff --git a/allianceauth/srp/templates/srp/data.html b/allianceauth/srp/templates/srp/data.html
index 7adfdb7c..3710c33f 100644
--- a/allianceauth/srp/templates/srp/data.html
+++ b/allianceauth/srp/templates/srp/data.html
@@ -49,16 +49,16 @@
 {% block content %}
     <div class="col-lg-12">
         <div class="row">
-            <h1 class="page-header text-center">{% trans "SRP Fleet Data" %}
+            <h1 class="page-header text-center">{% translate "SRP Fleet Data" %}
                 <div class="text-right">
                     {% if perms.auth.srp_management %}
                         {% if fleet_status == "Completed" %}
                             <a href="{% url 'srp:mark_uncompleted' fleet_id %}" class="btn btn-warning">
-                                {% trans "Mark Incomplete" %}
+                                {% translate "Mark Incomplete" %}
                             </a>
                         {% else %}
                             <a href="{% url 'srp:mark_completed' fleet_id %}" class="btn btn-success">
-                                {% trans "Mark Completed" %}
+                                {% translate "Mark Completed" %}
                             </a>
                         {% endif %}
                     {% endif %}
@@ -70,8 +70,8 @@
                     {% csrf_token %}
                     <div class="alert alert-info" role="alert">
                         <div class="text-right">
-                            <b><span style="padding-right:2.5em">{% trans "Total Losses:" %} {{ srpfleetrequests.count }}</span></b>
-                            <b><span style="padding-right:2.5em">{% trans "Total ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
+                            <b><span style="padding-right:2.5em">{% translate "Total Losses:" %} {{ srpfleetrequests.count }}</span></b>
+                            <b><span style="padding-right:2.5em">{% translate "Total ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
                             {% if perms.auth.srp_management %}
                                 <button type="submit" title="Approve" class="btn btn-success" formaction="{% url 'srp:request_approve' %}">
                                     <span class="glyphicon glyphicon-ok"></span>
@@ -79,7 +79,7 @@
                                 <button type="submit" title="Reject" class="btn btn-warning" formaction="{% url 'srp:request_reject' %}">
                                     <span class="glyphicon glyphicon-remove"></span>
                                 </button>
-                                <button type="submit" title="Remove" onclick="return confirm('{% trans "Are you sure you want to delete SRP requests?" %}')" class="btn btn-danger" formaction="{% url 'srp:request_remove' %}">
+                                <button type="submit" title="Remove" onclick="return confirm('{% translate "Are you sure you want to delete SRP requests?" %}')" class="btn btn-danger" formaction="{% url 'srp:request_remove' %}">
                                     <span class="glyphicon glyphicon-trash"></span>
                                 </button>
                             {% endif %}
@@ -88,19 +88,19 @@
                     <div class="table-responsive">
                         <table class="table srplist">
                             <thead>
-                                <th class="text-center">{% trans "Pilot Name" %}</th>
-                                <th class="text-center">{% trans "Killboard Link" %}</th>
-                                <th class="text-center">{% trans "Additional Info" %}</th>
-                                <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" %}
+                                <th class="text-center">{% translate "Pilot Name" %}</th>
+                                <th class="text-center">{% translate "Killboard Link" %}</th>
+                                <th class="text-center">{% translate "Additional Info" %}</th>
+                                <th class="text-center">{% translate "Ship Type" %}</th>
+                                <th class="text-center">{% translate "Killboard Loss Amt" %}</th>
+                                <th class="text-center">{% translate "SRP ISK Cost" %}
                                 <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>
+                                <th class="text-center">{% translate "Post Time" %}</th>
+                                <th class="text-center">{% translate "Status" %}</th>
                                 {% if perms.auth.srp_management %}
-                                    <th class="text-center">{% trans "Actions" %}</th>
+                                    <th class="text-center">{% translate "Actions" %}</th>
                                 {% endif %}
                             </thead>
 
@@ -127,15 +127,15 @@ ESC to cancel{% endblocktrans %}"id="blah"></i></th>
                                     <td class="text-center">
                                         {% if srpfleetrequest.srp_status == "Approved" %}
                                             <div class="label label-success">
-                                                {% trans "Approved" %}
+                                                {% translate "Approved" %}
                                             </div>
                                         {% elif srpfleetrequest.srp_status == "Rejected" %}
                                             <div class="label label-danger">
-                                                {% trans "Rejected" %}
+                                                {% translate "Rejected" %}
                                             </div>
                                         {% else %}
                                             <div class="label label-warning">
-                                                {% trans "Pending" %}
+                                                {% translate "Pending" %}
                                             </div>
                                         {% endif %}
                                     </td>
@@ -157,8 +157,8 @@ ESC to cancel{% endblocktrans %}"id="blah"></i></th>
                     </div>
                     <div class="alert alert-info" role="alert">
                         <div class="text-right">
-                            <b><span style="padding-right:2.5em">{% trans "Total Losses:" %} {{ srpfleetrequests.count }}</span></b>
-                            <b><span style="padding-right:2.5em">{% trans "Total ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
+                            <b><span style="padding-right:2.5em">{% translate "Total Losses:" %} {{ srpfleetrequests.count }}</span></b>
+                            <b><span style="padding-right:2.5em">{% translate "Total ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
                             {% if perms.auth.srp_management %}
                                 <button type="submit" title="Approve" class="btn btn-success" formaction="{% url 'srp:request_approve' %}">
                                     <span class="glyphicon glyphicon-ok"></span>
@@ -166,7 +166,7 @@ ESC to cancel{% endblocktrans %}"id="blah"></i></th>
                                 <button type="submit" title="Reject" class="btn btn-warning" formaction="{% url 'srp:request_reject' %}">
                                     <span class="glyphicon glyphicon-remove"></span>
                                 </button>
-                                <button type="submit" title="Remove" onclick="return confirm('{% trans "Are you sure you want to delete SRP requests?" %}')" class="btn btn-danger" formaction="{% url 'srp:request_remove' %}">
+                                <button type="submit" title="Remove" onclick="return confirm('{% translate "Are you sure you want to delete SRP requests?" %}')" class="btn btn-danger" formaction="{% url 'srp:request_remove' %}">
                                     <span class="glyphicon glyphicon-trash"></span>
                                 </button>
                             {% endif %}
@@ -175,7 +175,7 @@ ESC to cancel{% endblocktrans %}"id="blah"></i></th>
                 </form>
             {% else %}
                 <div class="alert alert-warning text-center">
-                    {% trans "No SRP requests for this fleet." %}
+                    {% translate "No SRP requests for this fleet." %}
                 </div>
             {% endif %}
         </div>
diff --git a/allianceauth/srp/templates/srp/management.html b/allianceauth/srp/templates/srp/management.html
index 50aa1253..805efbe5 100644
--- a/allianceauth/srp/templates/srp/management.html
+++ b/allianceauth/srp/templates/srp/management.html
@@ -5,45 +5,45 @@
 
 {% load humanize %}
 
-{% block page_title %}{% trans "Srp Management" %}{% endblock page_title %}
+{% block page_title %}{% translate "Srp Management" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
     <div class="col-lg-12">
         <div class="row">
-            <h1 class="page-header text-center">{% trans "SRP Management" %}
+            <h1 class="page-header text-center">{% translate "SRP Management" %}
                 <div class="text-right">
                     {% if perms.auth.srp_management %}
                         <a href="{% url 'srp:all' %}" class="btn btn-primary">
-                            {% trans "View All" %}
+                            {% translate "View All" %}
                         </a>
                     {% endif %}
                     {% if perms.srp.add_srpfleetmain or perms.auth.srp_management %}
                         <a href="{% url 'srp:add' %}" class="btn btn-success">
-                            {% trans "Add SRP Fleet" %}
+                            {% translate "Add SRP Fleet" %}
                         </a>
                     {% endif %}
                 </div>
             </h1>
             <div class="alert alert-info" role="alert">
                 <div class="text-right">
-                    <b>{% trans "Total ISK Cost:" %} {{ totalcost | intcomma }}</b>
+                    <b>{% translate "Total ISK Cost:" %} {{ totalcost | intcomma }}</b>
                 </div>
             </div>
             {% if srpfleets %}
                 <div class="table-responsive">
                     <table class="table">
                         <tr>
-                            <th class="text-center">{% trans "Fleet Name" %}</th>
-                            <th class="text-center">{% trans "Fleet Time" %}</th>
-                            <th class="text-center">{% trans "Fleet Doctrine" %}</th>
-                            <th class="text-center">{% trans "Fleet Commander" %}</th>
-                            <th class="text-center">{% trans "Fleet AAR" %}</th>
-                            <th class="text-center">{% trans "Fleet SRP Code" %}</th>
-                            <th class="text-center">{% trans "Fleet ISK Cost" %}</th>
-                            <th class="text-center">{% trans "SRP Status" %}</th>
-                            <th class="text-center">{% trans "Pending Requests" %}</th>
-                            <th width="100px" class="text-center">{% trans "Actions" %}</th>
+                            <th class="text-center">{% translate "Fleet Name" %}</th>
+                            <th class="text-center">{% translate "Fleet Time" %}</th>
+                            <th class="text-center">{% translate "Fleet Doctrine" %}</th>
+                            <th class="text-center">{% translate "Fleet Commander" %}</th>
+                            <th class="text-center">{% translate "Fleet AAR" %}</th>
+                            <th class="text-center">{% translate "Fleet SRP Code" %}</th>
+                            <th class="text-center">{% translate "Fleet ISK Cost" %}</th>
+                            <th class="text-center">{% translate "SRP Status" %}</th>
+                            <th class="text-center">{% translate "Pending Requests" %}</th>
+                            <th width="100px" class="text-center">{% translate "Actions" %}</th>
                         </tr>
                         {% for srpfleet in srpfleets %}
                             <tr>
@@ -61,7 +61,7 @@
                                 </td>
                                 <td class="text-center">
                                     {%  if srpfleet.fleet_srp_aar_link %}
-                                        <a href="{{ srpfleet.fleet_srp_aar_link }}" target="_blank" class="label label-primary">{% trans 'Link' %}</a>
+                                        <a href="{{ srpfleet.fleet_srp_aar_link }}" target="_blank" class="label label-primary">{% translate 'Link' %}</a>
                                     {%  endif %}
                                 </td>
                                 <td class="text-center">
@@ -69,7 +69,7 @@
                                         <a class="label label-warning" href="{% url 'srp:request' srpfleet.fleet_srp_code %}">{{ srpfleet.fleet_srp_code }}</a>
                                     {% else %}
                                         <div class="label label-danger">
-                                            {% trans "Disabled" %}
+                                            {% translate "Disabled" %}
                                         </div>
                                     {% endif %}
                                 </td>
@@ -78,11 +78,11 @@
                                 <td class="text-center">
                                     {% if srpfleet.fleet_srp_status == "" %}
                                         <div class="label label-warning">
-                                            {% trans "Pending" %}
+                                            {% translate "Pending" %}
                                         </div>
                                     {% else %}
                                         <div class="label label-success">
-                                            {% trans "Completed" %}
+                                            {% translate "Completed" %}
                                         </div>
                                     {% endif %}
                                 </td>
@@ -100,7 +100,7 @@
                                             <span class="glyphicon glyphicon-pencil"></span>
                                         </a>
 
-                                        <a href="{% url 'srp:remove' srpfleet.id %}" onclick="return confirm('{% trans "Are you sure you want to delete this SRP code and its contents?" %}')" class="btn btn-danger" title="Remove">
+                                        <a href="{% url 'srp:remove' srpfleet.id %}" onclick="return confirm('{% translate "Are you sure you want to delete this SRP code and its contents?" %}')" class="btn btn-danger" title="Remove">
                                             <span class="glyphicon glyphicon-trash"></span>
                                         </a>
                                         {% if srpfleet.fleet_srp_code %}
@@ -121,7 +121,7 @@
                 </div>
             {% else %}
                 <div class="alert alert-warning text-center">
-                    {% trans "No SRP fleets created." %}
+                    {% translate "No SRP fleets created." %}
                 </div>
             {% endif %}
         </div>
diff --git a/allianceauth/srp/templates/srp/request.html b/allianceauth/srp/templates/srp/request.html
index c783fd9c..eaccf7e5 100644
--- a/allianceauth/srp/templates/srp/request.html
+++ b/allianceauth/srp/templates/srp/request.html
@@ -3,12 +3,12 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "SRP Request" %}{% endblock page_title %}
+{% block page_title %}{% translate "SRP Request" %}{% endblock page_title %}
 
 {% block content %}
 
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% trans "Create SRP Request" %}</h1>
+        <h1 class="page-header text-center">{% translate "Create SRP Request" %}</h1>
 
         <div class="container-fluid">
             <div class="col-md-4 col-md-offset-4">
@@ -17,7 +17,7 @@
                         {% csrf_token %}
                         {{ form|bootstrap }}
                         <br/>
-                        <button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Create SRP Request" %}
+                        <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Create SRP Request" %}
                         </button>
                     </form>
                 </div>
diff --git a/allianceauth/srp/templates/srp/update.html b/allianceauth/srp/templates/srp/update.html
index 5af774b2..ea141580 100644
--- a/allianceauth/srp/templates/srp/update.html
+++ b/allianceauth/srp/templates/srp/update.html
@@ -3,24 +3,24 @@
 {% load static %}
 {% load i18n %}
 
-{% block page_title %}{% trans "Update AAR Link" %}{% endblock page_title %}
+{% block page_title %}{% translate "Update AAR Link" %}{% endblock page_title %}
 
 {% block content %}
 
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% trans "Update AAR Link" %}</h1>
+        <h1 class="page-header text-center">{% translate "Update AAR Link" %}</h1>
 
         <div class="container-fluid">
             <div class="col-md-4 col-md-offset-4">
                 <div class="row">
                     {% if no_fleet_id %}
-                        <div class="alert alert-danger" role="alert">{% trans "SRP Fleet Does Not Exist" %}</div>
+                        <div class="alert alert-danger" role="alert">{% translate "SRP Fleet Does Not Exist" %}</div>
                     {% else %}
                         <form class="form-signin" role="form" action="" method="POST">
                             {% csrf_token %}
                             {{ form|bootstrap }}
                             <br/>
-                            <button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Update AAR Link" %}
+                            <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Update AAR Link" %}
                             </button>
                         </form>
                     {% endif %}
diff --git a/allianceauth/templates/allianceauth/admin-status/overview.html b/allianceauth/templates/allianceauth/admin-status/overview.html
index 0923e076..8d6d451a 100644
--- a/allianceauth/templates/allianceauth/admin-status/overview.html
+++ b/allianceauth/templates/allianceauth/admin-status/overview.html
@@ -3,15 +3,15 @@
     <div class="row vertical-flexbox-row2">
         <div class="col-sm-6">
             <div class="panel panel-primary" style="height:100%;position:relative;">
-                <div class="panel-heading text-center"><h3 class="panel-title">{% trans "Alliance Auth Notifications" %}</h3></div>
+                <div class="panel-heading text-center"><h3 class="panel-title">{% translate "Alliance Auth Notifications" %}</h3></div>
                 <div class="panel-body">
                     <ul class="list-group">
                         {% for notif in notifications %}
                         <li class="list-group-item">
                             {% if notif.state == 'opened' %}
-                                <span class="label label-success">{% trans "Open" %}</span>
+                                <span class="label label-success">{% translate "Open" %}</span>
                             {% else %}
-                                <span class="label label-danger">{% trans "Closed" %}</span>
+                                <span class="label label-danger">{% translate "Closed" %}</span>
                             {% endif %}
                             <a href="{{ notif.web_url }}" target="_blank">#{{ notif.iid }} {{ notif.title }}</a>
                         </li>
@@ -38,34 +38,34 @@
         </div>
         <div class="col-sm-6">
             <div class="panel panel-primary" style="height:50%;">
-                <div class="panel-heading text-center"><h3 class="panel-title">{% trans "Software Version" %}</h3></div>
+                <div class="panel-heading text-center"><h3 class="panel-title">{% translate "Software Version" %}</h3></div>
                 <div class="panel-body flex-center-horizontal">
                     <ul class="list-group list-group-horizontal" style="margin-bottom: 0;">
                         <li class="list-group-item">
-                            <h5 class="list-group-item-heading">{% trans "Current" %}</h5>
+                            <h5 class="list-group-item-heading">{% translate "Current" %}</h5>
                             <p class="list-group-item-text">
                                 {{ current_version }}
                             </p>
                         </li>
                         <li class="list-group-item list-group-item-{% if latest_patch %}success{% elif latest_minor %}warning{% else %}danger{% endif %}">
-                            <h5 class="list-group-item-heading">{% trans "Latest Stable" %}</h5>
+                            <h5 class="list-group-item-heading">{% translate "Latest Stable" %}</h5>
                             <p class="list-group-item-text">
                                 <a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000">
                                     <i class="fab fa-gitlab hidden-xs" aria-hidden="true"></i>
                                     {{ latest_patch_version }}
                                 </a>
-                                {% if not latest_patch %}<br>{% trans "Update available" %}{% endif %}
+                                {% if not latest_patch %}<br>{% translate "Update available" %}{% endif %}
                             </p>
                         </li>
                         {% if latest_beta %}
                         <li class="list-group-item list-group-item-info">
-                            <h5 class="list-group-item-heading">{% trans "Latest Pre-Release" %}</h5>
+                            <h5 class="list-group-item-heading">{% translate "Latest Pre-Release" %}</h5>
                             <p class="list-group-item-text">
                                 <a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000">
                                     <i class="fab fa-gitlab hidden-xs" aria-hidden="true"></i>
                                     {{ latest_beta_version }}
                                 </a>
-                                <br>{% trans "Pre-Release available" %}
+                                <br>{% translate "Pre-Release available" %}
                             </p>
                         </li>
                         {% endif %}
@@ -73,7 +73,7 @@
                 </div>
             </div>
             <div class="panel panel-primary" style="height:50%;">
-                <div class="panel-heading text-center"><h3 class="panel-title">{% trans "Task Queue" %}</h3></div>
+                <div class="panel-heading text-center"><h3 class="panel-title">{% translate "Task Queue" %}</h3></div>
                 <div class="panel-body flex-center-horizontal">
                     <div class="progress" style="height: 21px;">
                         <div class="progress-bar
@@ -90,7 +90,7 @@
                         </div>
                     </div>
                     {% if task_queue_length < 0 %}
-                        {% trans "Error retrieving task queue length" %}
+                        {% translate "Error retrieving task queue length" %}
                     {% else %}
                         {% blocktrans trimmed count tasks=task_queue_length %}
                         {{ tasks }} task
diff --git a/allianceauth/templates/allianceauth/base.html b/allianceauth/templates/allianceauth/base.html
index 9d1798c9..277a0c26 100644
--- a/allianceauth/templates/allianceauth/base.html
+++ b/allianceauth/templates/allianceauth/base.html
@@ -12,7 +12,7 @@
         <meta name="author" content="">
         {% include 'allianceauth/icons.html' %}
 
-        <title>{% block title %}{% block page_title %}{% endblock page_title %} - Alliance Auth{% endblock title %}</title>
+        <title>{% block title %}{% block page_title %}{% endblock page_title %} - {{ SITE_NAME }}{% endblock title %}</title>
 
         {% include 'bundles/bootstrap-css.html' %}
         {% include 'bundles/fontawesome.html' %}
diff --git a/allianceauth/templates/allianceauth/night-toggle.html b/allianceauth/templates/allianceauth/night-toggle.html
index a4fc93e8..632eddf2 100644
--- a/allianceauth/templates/allianceauth/night-toggle.html
+++ b/allianceauth/templates/allianceauth/night-toggle.html
@@ -3,6 +3,6 @@
 <li>
     <a href="{% url 'nightmode' %}?next={{ request.path|urlencode }}">
         <i class="fas {% if NIGHT_MODE %}fa-toggle-on{% else %}fa-toggle-off{% endif %}" aria-hidden="true"></i>
-        {% trans "Night Mode" %}
+        {% translate "Night Mode" %}
     </a>
 </li>
diff --git a/allianceauth/templates/allianceauth/side-menu.html b/allianceauth/templates/allianceauth/side-menu.html
index 28a7e9fa..fc8335b0 100644
--- a/allianceauth/templates/allianceauth/side-menu.html
+++ b/allianceauth/templates/allianceauth/side-menu.html
@@ -7,12 +7,12 @@
         <ul class="nav nav-pills nav-stacked gray-icon-color" id="side-menu">
             <li>
                 <a class="{% navactive request 'authentication:dashboard' %}" href="{% url 'authentication:dashboard' %}">
-                    <i class="fas fa-tachometer-alt fa-fw"></i> {% trans "Dashboard" %}
+                    <i class="fas fa-tachometer-alt fa-fw"></i> {% translate "Dashboard" %}
                 </a>
             </li>
             <li>
                 <a class="{% navactive request 'groupmanagement:groups' %}" href="{% url 'groupmanagement:groups' %}">
-                    <i class="fas fa-users fa-fw"></i> {% trans "Groups" %}
+                    <i class="fas fa-users fa-fw"></i> {% translate "Groups" %}
                 </a>
             </li>
 
diff --git a/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html b/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html
index 63265ba8..235925d3 100644
--- a/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html
+++ b/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html
@@ -8,7 +8,7 @@
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">
-            {% trans "Delete Timer" %}
+            {% translate "Delete Timer" %}
             {% include 'timerboard/index_button.html' %}
         </h1>
         <div class="container-fluid">
diff --git a/allianceauth/timerboard/templates/timerboard/timer_create_form.html b/allianceauth/timerboard/templates/timerboard/timer_create_form.html
index 750fab08..9ff5dc75 100644
--- a/allianceauth/timerboard/templates/timerboard/timer_create_form.html
+++ b/allianceauth/timerboard/templates/timerboard/timer_create_form.html
@@ -2,13 +2,13 @@
 {% load i18n %}
 
 {% block page_title %}
-    {% trans "Create Timer" %}
+    {% translate "Create Timer" %}
 {% endblock page_title %}
 
 {% block page_header %}
-    {% trans "Create Structure Timer" %}
+    {% translate "Create Structure Timer" %}
 {% endblock %}
 
 {% block submit_button_text %}
-    {% trans "Create Timer" %}
+    {% translate "Create Timer" %}
 {% endblock %}
diff --git a/allianceauth/timerboard/templates/timerboard/timer_update_form.html b/allianceauth/timerboard/templates/timerboard/timer_update_form.html
index e54bcd7f..7b2b0f48 100644
--- a/allianceauth/timerboard/templates/timerboard/timer_update_form.html
+++ b/allianceauth/timerboard/templates/timerboard/timer_update_form.html
@@ -2,13 +2,13 @@
 {% load i18n %}
 
 {% block page_title %}
-    {% trans "Update Structure Timer" %}
+    {% translate "Update Structure Timer" %}
 {% endblock page_title %}
 
 {% block page_header %}
-    {% trans "Update Structure Timer" %}
+    {% translate "Update Structure Timer" %}
 {% endblock %}
 
 {% block submit_button_text %}
-    {% trans "Update Structure Timer" %}
+    {% translate "Update Structure Timer" %}
 {% endblock %}
diff --git a/allianceauth/timerboard/templates/timerboard/view.html b/allianceauth/timerboard/templates/timerboard/view.html
index 3d534fb9..12eaf05c 100644
--- a/allianceauth/timerboard/templates/timerboard/view.html
+++ b/allianceauth/timerboard/templates/timerboard/view.html
@@ -4,40 +4,40 @@
 {% get_current_language as LANGUAGE_CODE %}
 {% load evelinks %}
 
-{% block page_title %}{% trans "Structure Timer Management" %}{% endblock page_title %}
+{% block page_title %}{% translate "Structure Timer Management" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% trans "Structure Timers" %}
+        <h1 class="page-header text-center">{% translate "Structure Timers" %}
             <div class="text-right">
                 {% if perms.auth.timer_management %}
                     <a href="{% url 'timerboard:add' %}" class="btn btn-success">
-                        {% trans "Create Structure Timer" %}
+                        {% translate "Create Structure Timer" %}
                     </a>
                 {% endif %}
             </div>
         </h1>
         <div class="col-lg-12 text-center">
             <div class="label label-info text-left">
-                <b>{% trans "Current Eve Time:" %} </b>
+                <b>{% translate "Current Eve Time:" %} </b>
             </div>
             <strong class="label label-info text-left" id="current-time"></strong>
         </div>
         {% if corp_timers %}
-            <h4><b>{% trans "Corp Timers" %}</b></h4>
+            <h4><b>{% translate "Corp Timers" %}</b></h4>
             <div class="table-responsive">
                 <table class="table">
                     <tr>
-                        <th style="width:150px" class="text-center">{% trans "Details" %}</th>
-                        <th class="text-center">{% trans "Objective" %}</th>
-                        <th class="text-center">{% trans "System" %}</th>
-                        <th class="text-center">{% trans "Structure" %}</th>
-                        <th class="text-center">{% trans "Eve Time" %}</th>
-                        <th class="text-center">{% trans "Local Time" %}</th>
-                        <th class="text-center">{% trans "Creator" %}</th>
+                        <th style="width:150px" class="text-center">{% translate "Details" %}</th>
+                        <th class="text-center">{% translate "Objective" %}</th>
+                        <th class="text-center">{% translate "System" %}</th>
+                        <th class="text-center">{% translate "Structure" %}</th>
+                        <th class="text-center">{% translate "Eve Time" %}</th>
+                        <th class="text-center">{% translate "Local Time" %}</th>
+                        <th class="text-center">{% translate "Creator" %}</th>
                         {% if perms.auth.timer_management %}
-                            <th class="text-center">{% trans "Action" %}</th>
+                            <th class="text-center">{% translate "Action" %}</th>
                         {% endif %}
                     </tr>
                     {% for timer in corp_timers %}
@@ -50,17 +50,17 @@
                     <td class="text-center">
                         {% if timer.objective == "Hostile" %}
                             <div class="label label-danger">
-                                {% trans "Hostile" %}
+                                {% translate "Hostile" %}
                             </div>
                         {% endif %}
                         {% if timer.objective == "Friendly" %}
                             <div class="label label-primary">
-                                {% trans "Friendly" %}
+                                {% translate "Friendly" %}
                             </div>
                         {% endif %}
                         {% if timer.objective == "Neutral" %}
                             <div class="label label-default">
-                                {% trans "Neutral" %}
+                                {% translate "Neutral" %}
                             </div>
                         {% endif %}
                     </td>
@@ -186,20 +186,20 @@
                 </table>
             </div>
         {% endif %}
-        <h4><b>{% trans "Next Timers" %}</b></h4>
+        <h4><b>{% translate "Next Timers" %}</b></h4>
         {% if future_timers %}
             <div class="table-responsive">
                 <table class="table">
                     <tr>
-                        <th style="width:150px" class="text-center">{% trans "Details" %}</th>
-                        <th class="text-center">{% trans "Objective" %}</th>
-                        <th class="text-center">{% trans "System" %}</th>
-                        <th class="text-center">{% trans "Structure" %}</th>
-                        <th class="text-center">{% trans "Eve Time" %}</th>
-                        <th class="text-center">{% trans "Local Time" %}</th>
-                        <th class="text-center">{% trans "Creator" %}</th>
+                        <th style="width:150px" class="text-center">{% translate "Details" %}</th>
+                        <th class="text-center">{% translate "Objective" %}</th>
+                        <th class="text-center">{% translate "System" %}</th>
+                        <th class="text-center">{% translate "Structure" %}</th>
+                        <th class="text-center">{% translate "Eve Time" %}</th>
+                        <th class="text-center">{% translate "Local Time" %}</th>
+                        <th class="text-center">{% translate "Creator" %}</th>
                         {% if perms.auth.timer_management %}
-                            <th class="text-center">{% trans "Action" %}</th>
+                            <th class="text-center">{% translate "Action" %}</th>
                         {% endif %}
                     </tr>
                     {% for timer in future_timers %}
@@ -212,17 +212,17 @@
                         <td class="text-center">
                         {% if timer.objective == "Hostile" %}
                             <div class="label label-danger">
-                                {% trans "Hostile" %}
+                                {% translate "Hostile" %}
                             </div>
                         {% endif %}
                         {% if timer.objective == "Friendly" %}
                             <div class="label label-primary">
-                                {% trans "Friendly" %}
+                                {% translate "Friendly" %}
                             </div>
                         {% endif %}
                         {% if timer.objective == "Neutral" %}
                             <div class="label label-default">
-                                {% trans "Neutral" %}
+                                {% translate "Neutral" %}
                             </div>
                         {% endif %}
                         </td>
@@ -350,24 +350,24 @@
             </div>
         {% else %}
             <div class="alert alert-warning text-center">
-                {% trans "No upcoming timers." %}
+                {% translate "No upcoming timers." %}
             </div>
         {% endif %}
 
-        <h4><b>{% trans "Past Timers" %}</b></h4>
+        <h4><b>{% translate "Past Timers" %}</b></h4>
         {% if past_timers %}
             <div class="table-responsive">
                 <table class="table">
                     <tr>
-                        <th style="width:150px" class="text-center">{% trans "Details" %}</th>
-                        <th class="text-center">{% trans "Objective" %}</th>
-                        <th class="text-center">{% trans "System" %}</th>
-                        <th class="text-center">{% trans "Structure" %}</th>
-                        <th class="text-center">{% trans "Eve Time" %}</th>
-                        <th class="text-center">{% trans "Local Time" %}</th>
-                        <th class="text-center">{% trans "Creator" %}</th>
+                        <th style="width:150px" class="text-center">{% translate "Details" %}</th>
+                        <th class="text-center">{% translate "Objective" %}</th>
+                        <th class="text-center">{% translate "System" %}</th>
+                        <th class="text-center">{% translate "Structure" %}</th>
+                        <th class="text-center">{% translate "Eve Time" %}</th>
+                        <th class="text-center">{% translate "Local Time" %}</th>
+                        <th class="text-center">{% translate "Creator" %}</th>
                         {% if perms.auth.timer_management %}
-                            <th class="text-center">{% trans "Action" %}</th>
+                            <th class="text-center">{% translate "Action" %}</th>
                         {% endif %}
                     </tr>
                     {% for timer in past_timers %}
@@ -380,17 +380,17 @@
                         <td class="text-center">
                         {% if timer.objective == "Hostile" %}
                             <div class="label label-danger">
-                                {% trans "Hostile" %}
+                                {% translate "Hostile" %}
                             </div>
                         {% endif %}
                         {% if timer.objective == "Friendly" %}
                             <div class="label label-primary">
-                                {% trans "Friendly" %}
+                                {% translate "Friendly" %}
                             </div>
                         {% endif %}
                         {% if timer.objective == "Neutral" %}
                             <div class="label label-default">
-                                {% trans "Neutral" %}
+                                {% translate "Neutral" %}
                             </div>
                         {% endif %}
                         </td>
@@ -518,7 +518,7 @@
             </div>
         {% else %}
             <div class="alert alert-warning text-center">
-                {% trans "No past timers." %}
+                {% translate "No past timers." %}
             </div>
         {% endif %}
     </div>