diff --git a/netbox/templates/core/job.html b/netbox/templates/core/job.html
index fb57d070d..e8b8c41b2 100644
--- a/netbox/templates/core/job.html
+++ b/netbox/templates/core/job.html
@@ -54,7 +54,7 @@
             </tr>
             <tr>
               <th scope="row">{% trans "Scheduled" %}</th>
-              <td>{{ object.scheduled|annotated_date|placeholder }}{% if object.interval %} ({% trans "every" %} {{ object.interval }} {% trans "seconds" %}){% endif %}</td>
+              <td>{{ object.scheduled|annotated_date|placeholder }}{% if object.interval %} ({% blocktranslate %}every {{ object.interval }} seconds{% endblocktranslate %}){% endif %}</td>
             </tr>
             <tr>
               <th scope="row">{% trans "Started" %}</th>
diff --git a/netbox/templates/dcim/cable_trace.html b/netbox/templates/dcim/cable_trace.html
index 6b4f81452..354bdf93e 100644
--- a/netbox/templates/dcim/cable_trace.html
+++ b/netbox/templates/dcim/cable_trace.html
@@ -2,7 +2,7 @@
 {% load helpers %}
 {% load i18n %}
 
-{% block title %}{% trans "Cable Trace for" %} {{ object|meta:"verbose_name"|bettertitle }} {{ object }}{% endblock %}
+{% block title %}{% blocktranslate %}Cable Trace for {{ object|meta:"verbose_name"|bettertitle }} {{ object }}{% endblocktranslate %}{% endblock %}
 
 {% block content %}
     <div class="row">
@@ -28,7 +28,7 @@
                           {% with viewname=next_node|viewname:"trace" %}
                             <li>
                               <a href="{% url viewname pk=next_node.pk %}">{{ next_node|meta:"verbose_name"|bettertitle }} {{ next_node }}</a>
-                              ({% trans "Cable" %} {{ next_node.cable|linkify }})
+                              ({% blocktranslate %}Cable {{ next_node.cable|linkify }}{% endblocktranslate %})
                             </li>
                           {% endwith %}
                         {% else %}
diff --git a/netbox/templates/dcim/consoleport_delete.html b/netbox/templates/dcim/consoleport_delete.html
index c0eeeab2e..4faf344d7 100644
--- a/netbox/templates/dcim/consoleport_delete.html
+++ b/netbox/templates/dcim/consoleport_delete.html
@@ -2,8 +2,8 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% trans "Delete console port" %} {{ consoleport }}?{% endblock %}
+{% block title %}{% blocktranslate %}Delete console port {{ consoleport }}?{% endblocktranslate %}{% endblock %}
 
 {% block message %}
-    <p>{% trans "Are you sure you want to delete this console port from" %} <strong>{{ consoleport.device }}</strong>?</p>
+    <p>{% blocktranslate %}Are you sure you want to delete this console port from <strong>{{ consoleport.device }}</strong>?{% endblocktranslate %}</p>
 {% endblock %}
diff --git a/netbox/templates/dcim/consoleserverport_delete.html b/netbox/templates/dcim/consoleserverport_delete.html
index 68dda99ee..3fe493c5b 100644
--- a/netbox/templates/dcim/consoleserverport_delete.html
+++ b/netbox/templates/dcim/consoleserverport_delete.html
@@ -2,8 +2,8 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% trans "Delete console server port" %} {{ consoleserverport }}?{% endblock %}
+{% block title %}{% blocktranslate %}Delete console server port {{ consoleserverport }}?{% endblocktranslate %}{% endblock %}
 
 {% block message %}
-    <p>{% trans "Are you sure you want to delete this console server port from" %} <strong>{{ consoleserverport.device }}</strong>?</p>
+    <p>{% blocktranslate %}Are you sure you want to delete this console server port from <strong>{{ consoleserverport.device }}</strong>?{% endblocktranslate %}</p>
 {% endblock %}
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index ecb66b3f6..de360f67d 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -295,7 +295,7 @@
                                     </tr>
                                     {% for leg in utilization.legs %}
                                         <tr>
-                                            <td style="padding-left: 20px">{% trans "Leg" %} {{ leg.name }}</td>
+                                            <td style="padding-left: 20px">{% blocktranslate %}Leg {{ leg.name }}{% endblocktranslate %}</td>
                                             <td>{{ leg.outlet_count }}</td>
                                             <td>{{ leg.allocated }}</td>
                                             {% if powerfeed.available_power %}
diff --git a/netbox/templates/dcim/devicebay_delete.html b/netbox/templates/dcim/devicebay_delete.html
index 5d9c117a9..27c1cc556 100644
--- a/netbox/templates/dcim/devicebay_delete.html
+++ b/netbox/templates/dcim/devicebay_delete.html
@@ -2,8 +2,8 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% trans "Delete device bay" %} {{ devicebay }}?{% endblock %}
+{% block title %}{% blocktranslate %}Delete device bay {{ devicebay }}?{% endblocktranslate %}{% endblock %}
 
 {% block message %}
-    <p>{% trans "Are you sure you want to delete this device bay from" %} <strong>{{ devicebay.device }}</strong>?</p>
+    <p>{% blocktranslate %}Are you sure you want to delete this device bay from <strong>{{ devicebay.device }}</strong>?{% endblocktranslate %}</p>
 {% endblock %}
diff --git a/netbox/templates/dcim/devicebay_depopulate.html b/netbox/templates/dcim/devicebay_depopulate.html
index f20203a50..8f9629f22 100644
--- a/netbox/templates/dcim/devicebay_depopulate.html
+++ b/netbox/templates/dcim/devicebay_depopulate.html
@@ -2,8 +2,8 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% trans "Remove" %} {{ device_bay.installed_device }} {% trans "from" %} {{ device_bay }}?{% endblock %}
+{% block title %}{% blocktranslate %}Remove {{ device_bay.installed_device }} from {{ device_bay }}?{% endblocktranslate %}{% endblock %}
 
 {% block message %}
-    <p>{% trans "Are you sure you want to remove" %} <strong>{{ device_bay.installed_device }}</strong> {% trans "from" %} <strong>{{ device_bay }}</strong>?</p>
+    <p>{% blocktranslate %}Are you sure you want to remove <strong>{{ device_bay.installed_device }}</strong> from <strong>{{ device_bay }}</strong>?{% endblocktranslate %}</p>
 {% endblock %}
diff --git a/netbox/templates/dcim/devicetype/component_templates.html b/netbox/templates/dcim/devicetype/component_templates.html
index 9a5210762..b075e1522 100644
--- a/netbox/templates/dcim/devicetype/component_templates.html
+++ b/netbox/templates/dcim/devicetype/component_templates.html
@@ -27,7 +27,7 @@
                 <div class="float-end">
                     <a href="{% url table.Meta.model|viewname:"add" %}?device_type={{ object.pk }}&return_url={{ return_url }}" class="btn btn-primary btn-sm">
                         <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
-                        {% trans "Add" %} {{ title }}
+                        {% blocktranslate %}Add {{ title }}{% endblocktranslate %}
                     </a>
                 </div>
                 <div class="clearfix"></div>
diff --git a/netbox/templates/dcim/inc/nonracked_devices.html b/netbox/templates/dcim/inc/nonracked_devices.html
index bf6c16fa1..ec32395e8 100644
--- a/netbox/templates/dcim/inc/nonracked_devices.html
+++ b/netbox/templates/dcim/inc/nonracked_devices.html
@@ -34,11 +34,11 @@
         {%  if total_nonracked_devices_count > nonracked_devices.count %}
             {% if object|meta:'verbose_name' == 'site' %}
                 <div class="text-muted">
-                    {% trans "Displaying" %} {{ nonracked_devices.count }} {% trans "of" %} {{ total_nonracked_devices_count }} {% trans "devices" %} (<a href="{% url 'dcim:device_list' %}?site_id={{ object.pk }}&rack_id=null">{% trans "View full list" %}</a>)
+                    {% blocktranslate %}Displaying {{ nonracked_devices.count }} of {{ total_nonracked_devices_count }} devices{% endblocktranslate %} (<a href="{% url 'dcim:device_list' %}?site_id={{ object.pk }}&rack_id=null">{% trans "View full list" %}</a>)
                 </div>
             {% elif object|meta:'verbose_name' == 'location' %}
                 <div class="text-muted">
-                    {% trans "Displaying" %} {{ nonracked_devices.count }} {% trans "of" %} {{ total_nonracked_devices_count }} {% trans "devices" %} (<a href="{% url 'dcim:device_list' %}?location_id={{ object.pk }}&rack_id=null">{% trans "View full list" %}</a>)
+                    {% blocktranslate %}Displaying {{ nonracked_devices.count }} of {{ total_nonracked_devices_count }} devices{% endblocktranslate %} (<a href="{% url 'dcim:device_list' %}?location_id={{ object.pk }}&rack_id=null">{% trans "View full list" %}</a>)
                 </div>
             {% endif %}
         {% endif %}
diff --git a/netbox/templates/dcim/interface_delete.html b/netbox/templates/dcim/interface_delete.html
index 929d0d07a..ef378eb31 100644
--- a/netbox/templates/dcim/interface_delete.html
+++ b/netbox/templates/dcim/interface_delete.html
@@ -2,8 +2,8 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% trans "Delete interface" %} {{ interface }}?{% endblock %}
+{% block title %}{% blocktranslate %}Delete interface {{ interface }}?{% endblocktranslate %}{% endblock %}
 
 {% block message %}
-    <p>{% trans "Are you sure you want to delete this interface from" %} <strong>{{ interface.device }}</strong>?</p>
+    <p>{% blocktranslate %}Are you sure you want to delete this interface from <strong>{{ interface.device }}</strong>?{% endblocktranslate %}</p>
 {% endblock %}
diff --git a/netbox/templates/dcim/inventoryitem_delete.html b/netbox/templates/dcim/inventoryitem_delete.html
index 04263b07c..73a0fe27c 100644
--- a/netbox/templates/dcim/inventoryitem_delete.html
+++ b/netbox/templates/dcim/inventoryitem_delete.html
@@ -2,8 +2,8 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% trans "Delete inventory item" %} {{ inventoryitem }}?{% endblock %}
+{% block title %}{% blocktranslate %}Delete inventory item {{ inventoryitem }}?{% endblocktranslate %}{% endblock %}
 
 {% block message %}
-    <p>{% trans "Are you sure you want to delete this inventory item from" %} <strong>{{ inventoryitem.device }}</strong>?</p>
+    <p>{% blocktranslate %}Are you sure you want to delete this inventory item from <strong>{{ inventoryitem.device }}</strong>?{% endblocktranslate %}</p>
 {% endblock %}
diff --git a/netbox/templates/dcim/moduletype/component_templates.html b/netbox/templates/dcim/moduletype/component_templates.html
index bb54a33f9..8acc6943d 100644
--- a/netbox/templates/dcim/moduletype/component_templates.html
+++ b/netbox/templates/dcim/moduletype/component_templates.html
@@ -27,7 +27,7 @@
                 <div class="float-end">
                     <a href="{% url table.Meta.model|viewname:"add" %}?module_type={{ object.pk }}&return_url={{ return_url }}" class="btn btn-primary btn-sm">
                         <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
-                        {% trans "Add" %} {{ title }}
+                        {% blocktranslate %}Add {{ title }}{% endblocktranslate %}
                     </a>
                 </div>
                 <div class="clearfix"></div>
diff --git a/netbox/templates/dcim/poweroutlet_delete.html b/netbox/templates/dcim/poweroutlet_delete.html
index bb9fb19c9..333a83006 100644
--- a/netbox/templates/dcim/poweroutlet_delete.html
+++ b/netbox/templates/dcim/poweroutlet_delete.html
@@ -2,8 +2,8 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% trans "Delete power outlet" %} {{ poweroutlet }}?{% endblock %}
+{% block title %}{% blocktranslate %}Delete power outlet {{ poweroutlet }}?{% endblocktranslate %}{% endblock %}
 
 {% block message %}
-    <p>{% trans "Are you sure you want to delete this power outlet from" %} <strong>{{ poweroutlet.device }}</strong>?</p>
+    <p>{% blocktranslate %}Are you sure you want to delete this power outlet from <strong>{{ poweroutlet.device }}</strong>?{% endblocktranslate %}</p>
 {% endblock %}
diff --git a/netbox/templates/dcim/powerport_delete.html b/netbox/templates/dcim/powerport_delete.html
index 07403453e..02976399b 100644
--- a/netbox/templates/dcim/powerport_delete.html
+++ b/netbox/templates/dcim/powerport_delete.html
@@ -2,8 +2,8 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% trans "Delete power port" %} {{ powerport }}?{% endblock %}
+{% block title %}{% blocktranslate %}Delete power port {{ powerport }}?{% endblocktranslate %}{% endblock %}
 
 {% block message %}
-    <p>{% trans "Are you sure you want to delete this power port from" %} <strong>{{ powerport.device }}</strong>?</p>
+    <p>{% blocktranslate %}Are you sure you want to delete this power port from <strong>{{ powerport.device }}</strong>?{% endblocktranslate %}</p>
 {% endblock %}
diff --git a/netbox/templates/dcim/rack/base.html b/netbox/templates/dcim/rack/base.html
index 2f4eb227c..fd1a96b9a 100644
--- a/netbox/templates/dcim/rack/base.html
+++ b/netbox/templates/dcim/rack/base.html
@@ -1,7 +1,7 @@
 {% extends 'generic/object.html' %}
 {% load i18n %}
 
-{% block title %}{% trans "Rack" %} {{ object }}{% endblock %}
+{% block title %}{% blocktranslate %}Rack {{ object }}{% endblocktranslate %}{% endblock %}
 
 {% block breadcrumbs %}
   {{ block.super }}
diff --git a/netbox/templates/dcim/rack_elevation_list.html b/netbox/templates/dcim/rack_elevation_list.html
index cd3b92294..55a55c55e 100644
--- a/netbox/templates/dcim/rack_elevation_list.html
+++ b/netbox/templates/dcim/rack_elevation_list.html
@@ -24,7 +24,7 @@
       </div>
       <div class="dropdown">
         <button type="button" class="btn btn-sm btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          <i class="mdi mdi-sort"></i>&nbsp;{% trans "Sort By" %} {{ sort_display_name }}
+          <i class="mdi mdi-sort"></i>&nbsp;{% blocktranslate %}Sort By {{ sort_display_name }}{% endblocktranslate %}
         </button>
         <ul class="dropdown-menu dropdown-menu-end">
           {% for sort_key, sort_display_name in sort_choices.items %}
diff --git a/netbox/templates/dcim/virtualchassis_add_member.html b/netbox/templates/dcim/virtualchassis_add_member.html
index 63af5059d..b3abb88ab 100644
--- a/netbox/templates/dcim/virtualchassis_add_member.html
+++ b/netbox/templates/dcim/virtualchassis_add_member.html
@@ -2,7 +2,7 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% trans "Add New Member to Virtual Chassis" %} {{ virtual_chassis }}{% endblock %}
+{% block title %}{% blocktranslate %}Add New Member to Virtual Chassis {{ virtual_chassis }}{% endblocktranslate %}{% endblock %}
 
 {% block content %}
     <form action="" method="post" enctype="multipart/form-data" class="form-object-edit">
diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html
index ca08e675e..367060852 100644
--- a/netbox/templates/dcim/virtualchassis_edit.html
+++ b/netbox/templates/dcim/virtualchassis_edit.html
@@ -3,7 +3,7 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% trans "Editing Virtual Chassis" %} {{ vc_form.instance }}{% endblock %}
+{% block title %}{% blocktranslate %}Editing Virtual Chassis {{ vc_form.instance }}{% endblocktranslate %}{% endblock %}
 
 {% block content-wrapper %}
   <div class="tab-content">
diff --git a/netbox/templates/dcim/virtualchassis_remove_member.html b/netbox/templates/dcim/virtualchassis_remove_member.html
index bb8147ce6..11fc5bf0c 100644
--- a/netbox/templates/dcim/virtualchassis_remove_member.html
+++ b/netbox/templates/dcim/virtualchassis_remove_member.html
@@ -5,5 +5,5 @@
 {% block title %}{% trans "Remove Virtual Chassis Member" %}?{% endblock %}
 
 {% block message %}
-    <p>{% trans "Are you sure you want to remove" %} <strong>{{ device }}</strong> {% trans "from virtual chassis" %} {{ device.virtual_chassis }}?</p>
+    <p>{% blocktranslate %}Are you sure you want to remove <strong>{{ device }}</strong> from virtual chassis {{ device.virtual_chassis }}?{% endblocktranslate %}</p>
 {% endblock %}
diff --git a/netbox/templates/extras/configrevision_restore.html b/netbox/templates/extras/configrevision_restore.html
index 134a0b547..1f439a78a 100644
--- a/netbox/templates/extras/configrevision_restore.html
+++ b/netbox/templates/extras/configrevision_restore.html
@@ -9,7 +9,7 @@
 
 {% block subtitle %}
   <div class="object-subtitle">
-    <span>{% trans "Created" %} {{ object.created|annotated_date }}</span>
+    <span>{% blocktranslate %}Created {{ object.created|annotated_date }}{% endblocktranslate %}</span>
   </div>
 {% endblock %}
 
diff --git a/netbox/templates/extras/objectchange.html b/netbox/templates/extras/objectchange.html
index afb6f9937..a90871a48 100644
--- a/netbox/templates/extras/objectchange.html
+++ b/netbox/templates/extras/objectchange.html
@@ -153,7 +153,7 @@
         {% include 'inc/panel_table.html' with table=related_changes_table heading='Related Changes' panel_class='default' %}
         {% if related_changes_count > related_changes_table.rows|length %}
             <div class="float-end">
-                <a href="{% url 'extras:objectchange_list' %}?request_id={{ object.request_id }}" class="btn btn-primary">{% trans "See All" %} {{ related_changes_count|add:"1" }} {% trans "Changes" %}</a>
+                <a href="{% url 'extras:objectchange_list' %}?request_id={{ object.request_id }}" class="btn btn-primary">{% blocktranslate %}See All {{ related_changes_count|add:"1" }} Changes{% endblocktranslate %}</a>
             </div>
         {% endif %}
     </div>
diff --git a/netbox/templates/generic/bulk_add_component.html b/netbox/templates/generic/bulk_add_component.html
index 0c0e482e1..c7e3c3210 100644
--- a/netbox/templates/generic/bulk_add_component.html
+++ b/netbox/templates/generic/bulk_add_component.html
@@ -4,7 +4,7 @@
 {% load render_table from django_tables2 %}
 {% load i18n %}
 
-{% block title %}{% trans "Add" %} {{ model_name|title }}{% endblock %}
+{% block title %}{% blocktranslate %}Add {{ model_name|title }}{% endblocktranslate %}{% endblock %}
 
 {% block tabs %}
   <ul class="nav nav-tabs px-3">
diff --git a/netbox/templates/generic/bulk_delete.html b/netbox/templates/generic/bulk_delete.html
index fef54ac65..5a1ceb048 100644
--- a/netbox/templates/generic/bulk_delete.html
+++ b/netbox/templates/generic/bulk_delete.html
@@ -14,7 +14,7 @@ Context:
   return_url: The URL to which the user is redirected after submitting the form
 {% endcomment %}
 
-{% block title %}{% trans "Delete" %} {{ table.rows|length }} {{ model|meta:"verbose_name_plural"|bettertitle }}?{% endblock %}
+{% block title %}{% blocktranslate %}Delete {{ table.rows|length }} {{ model|meta:"verbose_name_plural"|bettertitle }}?{% endblocktranslate %}{% endblock %}
 
 {% block content %}
   <div class="container-md px-0">
@@ -37,7 +37,7 @@ Context:
           {{ field }}
         {% endfor %}
         <div class="text-end">
-          <button type="submit" name="_confirm" class="btn btn-danger">{% trans "Delete" %} {{ table.rows|length }} {{ model|meta:"verbose_name_plural" }}</button>
+          <button type="submit" name="_confirm" class="btn btn-danger">{% blocktranslate %}Delete {{ table.rows|length }} {{ model|meta:"verbose_name_plural" }}{% endblocktranslate %}</button>
           <a href="{{ return_url }}" class="btn btn-outline-dark">{% trans "Cancel" %}</a>
         </div>
       </form>
diff --git a/netbox/templates/generic/bulk_edit.html b/netbox/templates/generic/bulk_edit.html
index 87f947dbe..699ec14f5 100644
--- a/netbox/templates/generic/bulk_edit.html
+++ b/netbox/templates/generic/bulk_edit.html
@@ -12,7 +12,7 @@ Context:
   return_url: The URL to which the user is redirected after submitting the form
 {% endcomment %}
 
-{% block title %}{% trans "Editing" %} {{ table.rows|length }} {{ model|meta:"verbose_name_plural"|bettertitle }}{% endblock %}
+{% block title %}{% blocktranslate %}Editing {{ table.rows|length }} {{ model|meta:"verbose_name_plural"|bettertitle }}{% endblocktranslate %}{% endblock %}
 
 {% block tabs %}
   <ul class="nav nav-tabs px-3">
diff --git a/netbox/templates/generic/bulk_remove.html b/netbox/templates/generic/bulk_remove.html
index 6329e35a5..c66a1e291 100644
--- a/netbox/templates/generic/bulk_remove.html
+++ b/netbox/templates/generic/bulk_remove.html
@@ -3,15 +3,15 @@
 {% load render_table from django_tables2 %}
 {% load i18n %}
 
-{% block title %}{% trans "Remove" %} {{ table.rows|length }} {{ obj_type_plural|bettertitle }}?{% endblock %}
+{% block title %}{% blocktranslate %}Remove {{ table.rows|length }} {{ obj_type_plural|bettertitle }}?{% endblocktranslate %}{% endblock %}
 
 {% block content %}
 <div class="container-md px-0">
   <div class="alert alert-danger" role="alert">
     <h4 class="alert-heading">{% trans "Confirm Bulk Removal" %}</h4>
-    <p><strong>{% trans "Warning" %}:</strong> {% trans "The following operation will remove" %} {{ table.rows|length }} {{ obj_type_plural }} {% trans "from" %} {{ parent_obj }}.</p>
+    <p><strong>{% blocktranslate %}Warning:</strong> The following operation will remove {{ table.rows|length }} {{ obj_type_plural }} from {{ parent_obj }}.{% endblocktranslate %}</p>
     <hr />
-    <p class="mb-0">{% trans "Please carefully review the" %} {{ obj_type_plural }} {% trans "to be removed and confirm below" %}.</p>
+    <p class="mb-0">{% blocktranslate %}Please carefully review the {{ obj_type_plural }} to be removed and confirm below.{% endblocktranslate %}</p>
   </div>
 </div>
 <div class="container-xl px-0">
@@ -24,7 +24,7 @@
       {{ field }}
     {% endfor %}
     <div class="text-center">
-      <button type="submit" name="_confirm" class="btn btn-danger">{% trans "Delete these" %} {{ table.rows|length }} {{ obj_type_plural }}</button>
+      <button type="submit" name="_confirm" class="btn btn-danger">{% blocktranslate %}Delete these {{ table.rows|length }} {{ obj_type_plural }}{% endblocktranslate %}</button>
       <a href="{{ return_url }}" class="btn btn-outline-dark">{% trans "Cancel" %}</a>
     </div>
   </form>
diff --git a/netbox/templates/generic/bulk_rename.html b/netbox/templates/generic/bulk_rename.html
index 6615318f9..d5d0e3798 100644
--- a/netbox/templates/generic/bulk_rename.html
+++ b/netbox/templates/generic/bulk_rename.html
@@ -3,7 +3,7 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% trans "Renaming" %} {{ selected_objects|length }} {{ obj_type_plural|bettertitle }}{% endblock %}
+{% block title %}{% blocktranslate %}Renaming {{ selected_objects|length }} {{ obj_type_plural|bettertitle }}{% endblocktranslate %}{% endblock %}
 
 {% block content %}
 <div class="row mb-3">
diff --git a/netbox/templates/generic/object_delete.html b/netbox/templates/generic/object_delete.html
index ef934452f..8367eb475 100644
--- a/netbox/templates/generic/object_delete.html
+++ b/netbox/templates/generic/object_delete.html
@@ -11,7 +11,7 @@ Context:
   return_url: The URL to which the user is redirected after submitting the form
 {% endcomment %}
 
-{% block title %}{% trans "Delete" %} {{ object|meta:"verbose_name" }}?{% endblock %}
+{% block title %}{% blocktranslate %}Delete {{ object|meta:"verbose_name" }}?{% endblocktranslate %}{% endblock %}
 
 {% block header %}{% endblock %}
 
diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html
index 52e3925e0..804807d08 100644
--- a/netbox/templates/generic/object_edit.html
+++ b/netbox/templates/generic/object_edit.html
@@ -13,7 +13,7 @@ Context:
 {% endcomment %}
 
 {% block title %}
-  {% if object.pk %}{% trans "Editing" %} {{ object|meta:"verbose_name" }} {{ object }}{% else %}{% trans "Add a new" %} {{ object|meta:"verbose_name" }}{% endif %}
+  {% if object.pk %}{% blocktranslate %}Editing {{ object|meta:"verbose_name" }} {{ object }}{% endblocktranslate %}{% else %}{% blocktranslate %}Add a new {{ object|meta:"verbose_name" }}{% endblocktranslate %}{% endif %}
 {% endblock title %}
 
 {% block tabs %}
diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 9c94cf71f..52634b1ff 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -91,7 +91,7 @@ Context:
                 <div class="form-check">
                   <input type="checkbox" id="select-all" name="_all" class="form-check-input" />
                   <label for="select-all" class="form-check-label">
-                    {% trans "Select" %} <strong>{% trans "all" %} {{ table.rows|length }} {{ table.data.verbose_name_plural }}</strong> {% trans "matching query" %}
+                    {% blocktranslate %}Select <strong>all {{ table.rows|length }} {{ table.data.verbose_name_plural }}</strong> matching query{% endblocktranslate %}
                   </label>
                 </div>
               </div>
diff --git a/netbox/templates/htmx/object_selector.html b/netbox/templates/htmx/object_selector.html
index 6977297b3..50dfb561a 100644
--- a/netbox/templates/htmx/object_selector.html
+++ b/netbox/templates/htmx/object_selector.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 <div class="modal-header">
-  <h5 class="modal-title">{% trans "Select" %} {{ model|meta:"verbose_name"|bettertitle }}</h5>
+  <h5 class="modal-title">{% blocktranslate %}Select {{ model|meta:"verbose_name"|bettertitle }}{% endblocktranslate %}</h5>
   <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
 <div class="modal-body row">
@@ -17,7 +17,7 @@
     </div>
   </div>
   <div class="col-9">
-    <form hx-get="{% url 'htmx_object_selector' %}?_model={{ model|meta:"{% trans "label_lower" %}" }}" hx-target="#selector_results" hx-trigger="load, submit, keyup from:#id_q delay:500ms">
+    <form hx-get="{% url 'htmx_object_selector' %}?_model={{ model|meta:"label_lower" }}" hx-target="#selector_results" hx-trigger="load, submit, keyup from:#id_q delay:500ms">
       <input type="hidden" name="_search" value="true" />
       <div class="tab-content p-1">
         {% for field in form.visible_fields %}
diff --git a/netbox/templates/inc/missing_prerequisites.html b/netbox/templates/inc/missing_prerequisites.html
index e1e8e8a83..efd5b878f 100644
--- a/netbox/templates/inc/missing_prerequisites.html
+++ b/netbox/templates/inc/missing_prerequisites.html
@@ -3,8 +3,8 @@
 
 <div class="alert alert-warning text-end" role="alert">
   <div class="float-start">
-    <i class="mdi mdi-alert"></i> {% trans "Before you can add a" %} {{ model|meta:"verbose_name" }} {% trans "you must first create a" %}
-      <strong>{{ prerequisite_model|meta:"verbose_name" }}</strong>.
+    <i class="mdi mdi-alert"></i> {% blocktranslate %}Before you can add a {{ model|meta:"verbose_name" }} you must first create a
+      <strong>{{ prerequisite_model|meta:"verbose_name" }}</strong>.{% endblocktranslate %}
   </div>
   {% add_button prerequisite_model %}
 </div>
diff --git a/netbox/templates/inc/paginator.html b/netbox/templates/inc/paginator.html
index 008428cbe..3a3ea43e2 100644
--- a/netbox/templates/inc/paginator.html
+++ b/netbox/templates/inc/paginator.html
@@ -46,7 +46,7 @@
         </ul>
       </div>
       <small class="text-end text-muted">
-        {% trans "Showing" %} {{ page.start_index }}-{{ page.end_index }} {% trans "of" %} {{ page.paginator.count }}
+        {% blocktranslate %}Showing {{ page.start_index }}-{{ page.end_index }} of {{ page.paginator.count }}{% endblocktranslate %}
       </small>
     {% endif %}
   </div>
diff --git a/netbox/templates/inc/paginator_htmx.html b/netbox/templates/inc/paginator_htmx.html
index b7173e466..5e0ec9e22 100644
--- a/netbox/templates/inc/paginator_htmx.html
+++ b/netbox/templates/inc/paginator_htmx.html
@@ -66,7 +66,7 @@
         </ul>
       </div>
       <small class="text-end text-muted">
-        {% trans "Showing" %} {{ page.start_index }}-{{ page.end_index }} {% trans "of" %} {{ page.paginator.count }}
+        {% blocktranslate %}Showing {{ page.start_index }}-{{ page.end_index }} of {{ page.paginator.count }}{% endblocktranslate %}
       </small>
     {% endif %}
   </div>
diff --git a/netbox/templates/virtualization/cluster_add_devices.html b/netbox/templates/virtualization/cluster_add_devices.html
index acd826429..7cdfa39ec 100644
--- a/netbox/templates/virtualization/cluster_add_devices.html
+++ b/netbox/templates/virtualization/cluster_add_devices.html
@@ -5,7 +5,7 @@
 
 {% render_errors form %}
 
-{% block title %}{% trans "Add Device to Cluster" %} {{ cluster }}{% endblock %}
+{% block title %}{% blocktranslate %}Add Device to Cluster {{ cluster }}{% endblocktranslate %}{% endblock %}
 
 {% block content %}
     <form action="." method="post">