From 79526c7c9de8640d8967c72f0c0aac68b6a82ec9 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Fri, 28 Jul 2023 14:18:30 -0400
Subject: [PATCH] Misc cleanup

---
 netbox/templates/base/base.html                          | 2 +-
 netbox/templates/dcim/cable.html                         | 4 ++--
 netbox/templates/dcim/interface.html                     | 2 +-
 netbox/templates/dcim/inventoryitem_edit.html            | 2 +-
 netbox/templates/dcim/powerfeed.html                     | 4 ++--
 netbox/templates/dcim/rack_elevation_list.html           | 2 +-
 netbox/templates/extras/configrevision.html              | 4 ++--
 netbox/templates/extras/dashboard/reset.html             | 4 ++--
 netbox/templates/extras/htmx/script_result.html          | 2 +-
 netbox/templates/extras/inc/configcontext_format.html    | 5 ++---
 netbox/templates/extras/objectchange.html                | 2 +-
 netbox/templates/generic/bulk_delete.html                | 9 ++++++---
 netbox/templates/generic/bulk_import.html                | 8 ++++----
 netbox/templates/generic/confirmation_form.html          | 2 +-
 netbox/templates/graphiql.html                           | 3 +--
 netbox/templates/home.html                               | 4 ++--
 netbox/templates/htmx/delete_form.html                   | 2 +-
 netbox/templates/inc/filter_list.html                    | 2 +-
 netbox/templates/inc/messages.html                       | 1 -
 netbox/templates/inc/table_controls_htmx.html            | 2 +-
 netbox/templates/ipam/aggregate.html                     | 2 +-
 netbox/templates/ipam/ipaddress.html                     | 6 +++---
 netbox/templates/ipam/iprange.html                       | 2 +-
 netbox/templates/ipam/prefix.html                        | 2 +-
 netbox/templates/ipam/service_edit.html                  | 2 +-
 netbox/templates/login.html                              | 2 +-
 netbox/templates/rest_framework/api.html                 | 4 ++--
 netbox/templates/users/account/preferences.html          | 2 +-
 netbox/templates/virtualization/cluster.html             | 2 +-
 netbox/templates/virtualization/virtualmachine.html      | 2 +-
 .../templates/wireless/inc/wirelesslink_interface.html   | 4 ++--
 netbox/templates/wireless/wirelesslink.html              | 4 ++--
 .../utilities/templates/helpers/table_config_form.html   | 4 ++--
 .../templates/widgets/clearable_file_input.html          | 2 +-
 34 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/netbox/templates/base/base.html b/netbox/templates/base/base.html
index 10d221730..0f6c9d9be 100644
--- a/netbox/templates/base/base.html
+++ b/netbox/templates/base/base.html
@@ -25,7 +25,7 @@
     />
 
     {# Page title #}
-    <title>{% block title %}{% trans "Home" %}{% endblock %} | {% trans "NetBox" %}</title>
+    <title>{% block title %}{% trans "Home" %}{% endblock %} | NetBox</title>
 
     <script
       type="text/javascript"
diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html
index 195c9130d..535b96977 100644
--- a/netbox/templates/dcim/cable.html
+++ b/netbox/templates/dcim/cable.html
@@ -67,13 +67,13 @@
     </div>
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Termination A" %}</h5>
+        <h5 class="card-header">{% trans "Termination" %} A</h5>
         <div class="card-body">
           {% include 'dcim/inc/cable_termination.html' with terminations=object.a_terminations %}
         </div>
       </div>
       <div class="card">
-        <h5 class="card-header">{% trans "Termination B" %}</h5>
+        <h5 class="card-header">{% trans "Termination" %} B</h5>
         <div class="card-body">
           {% include 'dcim/inc/cable_termination.html' with terminations=object.b_terminations %}
         </div>
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index 0aeceea03..f4cba49ee 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -83,7 +83,7 @@
               <td>{{ object.get_mode_display|placeholder }}</td>
             </tr>
             <tr>
-              <th scope="row">{% trans "Transmit power (dBm" %})</th>
+              <th scope="row">{% trans "Transmit power (dBm)" %}</th>
               <td>{{ object.tx_power|placeholder }}</td>
             </tr>
           </table>
diff --git a/netbox/templates/dcim/inventoryitem_edit.html b/netbox/templates/dcim/inventoryitem_edit.html
index 7eb325902..640f8dbfe 100644
--- a/netbox/templates/dcim/inventoryitem_edit.html
+++ b/netbox/templates/dcim/inventoryitem_edit.html
@@ -7,7 +7,7 @@
 {% block form %}
     <div class="field-group my-5">
       <div class="row mb-2">
-        <h5 class="offset-sm-3">{% trans "InventoryItem" %}</h5>
+        <h5 class="offset-sm-3">{% trans "Inventory Item" %}</h5>
       </div>
       {% render_field form.device %}
       {% render_field form.parent %}
diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html
index 1c8f47f7d..5e8345db7 100644
--- a/netbox/templates/dcim/powerfeed.html
+++ b/netbox/templates/dcim/powerfeed.html
@@ -83,11 +83,11 @@
                     </tr>
                     <tr>
                         <th scope="row">{% trans "Voltage" %}</th>
-                        <td>{{ object.voltage }}{% trans "V" %}</td>
+                        <td>{{ object.voltage }}V</td>
                     </tr>
                     <tr>
                         <th scope="row">{% trans "Amperage" %}</th>
-                        <td>{{ object.amperage }}{% trans "A" %}</td>
+                        <td>{{ object.amperage }}A</td>
                     </tr>
                     <tr>
                         <th scope="row">{% trans "Phase" %}</th>
diff --git a/netbox/templates/dcim/rack_elevation_list.html b/netbox/templates/dcim/rack_elevation_list.html
index 55a55c55e..e1512e7ba 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;{% blocktranslate %}Sort By {{ sort_display_name }}{% endblocktranslate %}
+          <i class="mdi mdi-sort"></i> {% trans "Sort By" %} {{ sort_display_name }}
         </button>
         <ul class="dropdown-menu dropdown-menu-end">
           {% for sort_key, sort_display_name in sort_choices.items %}
diff --git a/netbox/templates/extras/configrevision.html b/netbox/templates/extras/configrevision.html
index 6fafabfcf..ea3962b20 100644
--- a/netbox/templates/extras/configrevision.html
+++ b/netbox/templates/extras/configrevision.html
@@ -65,11 +65,11 @@
         <div class="card-body">
           <table class="table table-hover attr-table">
             <tr>
-              <th scope="row">{% trans "IPAM enforce global unique" %}:</th>
+              <th scope="row">{% trans "Enforce global unique" %}:</th>
               <td>{{ object.data.ENFORCE_GLOBAL_UNIQUE }}</td>
             </tr>
             <tr>
-              <th scope="row">{% trans "IPAM prefer IPV4" %}:</th>
+              <th scope="row">{% trans "Prefer IPv4" %}:</th>
               <td>{{ object.data.PREFER_IPV4 }}</td>
             </tr>
           </table>
diff --git a/netbox/templates/extras/dashboard/reset.html b/netbox/templates/extras/dashboard/reset.html
index 41f442e14..ceb032c0d 100644
--- a/netbox/templates/extras/dashboard/reset.html
+++ b/netbox/templates/extras/dashboard/reset.html
@@ -4,6 +4,6 @@
 {% block title %}{% trans "Reset Dashboard" %}?{% endblock %}
 
 {% block message %}
-  <p>{% trans "This will remove" %} <strong>{% trans "all" %}</strong> {% trans "configured widgets and restore the default dashboard configuration" %}.</p>
-  <p>{% trans "This change affects on" %} <i>{% trans "your" %}</i> {% trans "dashboard, and will not impact other users" %}.</p>
+  <p>{% blocktrans %}This will remove <strong>all</strong> configured widgets and restore the default dashboard configuration.{% endblocktrans %}</p>
+  <p>{% blocktrans %}This change affects only <i>your</i> dashboard, and will not impact other users.{% endblocktrans %}</p>
 {% endblock %}
diff --git a/netbox/templates/extras/htmx/script_result.html b/netbox/templates/extras/htmx/script_result.html
index 4caa19cdb..ddc9b05f6 100644
--- a/netbox/templates/extras/htmx/script_result.html
+++ b/netbox/templates/extras/htmx/script_result.html
@@ -43,7 +43,7 @@
     </div>
     {% if execution_time %}
       <div class="card-footer text-end text-muted">
-        <small>{% trans "Exec Time" %}: {{ execution_time|floatformat:3 }}{% trans "s" %}</small>
+        <small>{% trans "Exec Time" %}: {{ execution_time|floatformat:3 }} {% trans "seconds" context "Unit of time" %}</small>
       </div>
     {% endif %}
   </div>
diff --git a/netbox/templates/extras/inc/configcontext_format.html b/netbox/templates/extras/inc/configcontext_format.html
index 2d74aa005..4df75d65b 100644
--- a/netbox/templates/extras/inc/configcontext_format.html
+++ b/netbox/templates/extras/inc/configcontext_format.html
@@ -1,7 +1,6 @@
-{% load i18n %}
 <div class="float-end">
     <div class="btn-group btn-group-sm" role="group">
-        <a href="?format=json" type="button" class="btn btn-outline-dark{% if format == 'json' %} active{% endif %}">{% trans "JSON" %}</a>
-        <a href="?format=yaml" type="button" class="btn btn-outline-dark{% if format == 'yaml' %} active{% endif %}">{% trans "YAML" %}</a>
+        <a href="?format=json" type="button" class="btn btn-outline-dark{% if format == 'json' %} active{% endif %}">JSON</a>
+        <a href="?format=yaml" type="button" class="btn btn-outline-dark{% if format == 'yaml' %} active{% endif %}">YAML</a>
     </div>
 </div>
diff --git a/netbox/templates/extras/objectchange.html b/netbox/templates/extras/objectchange.html
index a90871a48..d681ecd75 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">{% blocktranslate %}See All {{ related_changes_count|add:"1" }} Changes{% endblocktranslate %}</a>
+                <a href="{% url 'extras:objectchange_list' %}?request_id={{ object.request_id }}" class="btn btn-primary">{% blocktrans with count=related_changes_count|add:"1" %}See All {{ count }} Changes{% endblocktrans %}</a>
             </div>
         {% endif %}
     </div>
diff --git a/netbox/templates/generic/bulk_delete.html b/netbox/templates/generic/bulk_delete.html
index 5a1ceb048..381c8a3b3 100644
--- a/netbox/templates/generic/bulk_delete.html
+++ b/netbox/templates/generic/bulk_delete.html
@@ -21,8 +21,11 @@ Context:
     <div class="alert alert-danger mb-3" role="alert">
       <h4 class="alert-heading">{% trans "Confirm Bulk Deletion" %}</h4>
       <hr />
-      <strong>{% trans "Warning" %}:</strong> {% trans "The following operation will delete" %} <strong>{{ table.rows|length }}</strong>
-      {{ model|meta:"verbose_name_plural" }}. {% trans "Please carefully review the objects to be deleted and confirm below" %}.
+      <strong>{% trans "Warning" context "Noun" %}:</strong>
+      {% blocktrans with count=table.rows|length type_plural=model|meta:"verbose_name_plural" %}
+        The following operation will delete <strong>{{ count }}</strong> {{ type_plural }}. Please
+        carefully review the objects to be deleted and confirm below.
+      {% endblocktrans %}
       {% block message_extra %}{% endblock %}
     </div>
   </div>
@@ -37,7 +40,7 @@ Context:
           {{ field }}
         {% endfor %}
         <div class="text-end">
-          <button type="submit" name="_confirm" class="btn btn-danger">{% blocktranslate %}Delete {{ table.rows|length }} {{ model|meta:"verbose_name_plural" }}{% endblocktranslate %}</button>
+          <button type="submit" name="_confirm" class="btn btn-danger">{% trans "Delete" %} {{ table.rows|length }} {{ model|meta:"verbose_name_plural" }}</button>
           <a href="{{ return_url }}" class="btn btn-outline-dark">{% trans "Cancel" %}</a>
         </div>
       </form>
diff --git a/netbox/templates/generic/bulk_import.html b/netbox/templates/generic/bulk_import.html
index 6d5557315..08f13765c 100644
--- a/netbox/templates/generic/bulk_import.html
+++ b/netbox/templates/generic/bulk_import.html
@@ -188,12 +188,12 @@ Context:
         </div>
     </div>
     <p class="small text-muted">
-        <i class="mdi mdi-check-bold text-success"></i> {% trans "Required fields" %} <strong>{% trans "must" %}</strong> {% trans "be specified for all
-        objects" %}.
+      <i class="mdi mdi-check-bold text-success"></i>
+      {% blocktrans %}Required fields <strong>must</strong> be specified for all objects.{% endblocktrans %}
     </p>
     <p class="small text-muted">
-        <i class="mdi mdi-information-outline"></i> {% trans "Related objects may be referenced by any unique attribute.
-        For example" %}, <code>{% trans "vrf.rd" %}</code> {% trans "would identify a VRF by its route distinguisher" %}.
+      <i class="mdi mdi-information-outline"></i>
+      {% blocktrans with example="vrf.rd" %}Related objects may be referenced by any unique attribute. For example, <code>{{ example }}</code> would identify a VRF by its route distinguisher.{% endblocktrans %}
     </p>
     {% endif %}
 
diff --git a/netbox/templates/generic/confirmation_form.html b/netbox/templates/generic/confirmation_form.html
index 53ca14ca4..14a36a61e 100644
--- a/netbox/templates/generic/confirmation_form.html
+++ b/netbox/templates/generic/confirmation_form.html
@@ -16,7 +16,7 @@
             {% block message %}<p>{% trans "Are you sure" %}?</p>{% endblock %}
           </div>
           <div class="card-footer text-end">
-            <button type="submit" name="_confirm" class="btn btn-{{ button_class|default:"{% trans "danger" %}" }}">{% trans "Confirm" %}</button>
+            <button type="submit" name="_confirm" class="btn btn-{{ button_class|default:"danger" }}">{% trans "Confirm" %}</button>
             <a href="{{ return_url }}" class="btn btn-outline-dark">{% trans "Cancel" %}</a>
           </div>
         </div>
diff --git a/netbox/templates/graphiql.html b/netbox/templates/graphiql.html
index c93b1849d..911dafef3 100644
--- a/netbox/templates/graphiql.html
+++ b/netbox/templates/graphiql.html
@@ -1,4 +1,3 @@
-{% load i18n %}
 {% comment %}
   This template derives from the graphene-django project:
   https://github.com/graphql-python/graphene-django/blob/main/graphene_django/templates/graphene/graphiql.html
@@ -24,7 +23,7 @@ add "&raw" to the end of the URL within a browser.
     </style>
     <link href="{% static 'graphiql.css'%}" rel="stylesheet" />
     <link rel="icon" type="image/png" href="{% static 'graphql.ico' %}" />
-    <title>{% trans "GraphiQL | NetBox" %}</title>
+    <title>GraphiQL | NetBox</title>
   </head>
   <body>
     <div id="editor"></div>
diff --git a/netbox/templates/home.html b/netbox/templates/home.html
index 707cf0c0e..357eb8a7c 100644
--- a/netbox/templates/home.html
+++ b/netbox/templates/home.html
@@ -11,10 +11,10 @@
         <h6 class="alert-heading">
           <i class="mdi mdi-information-outline"></i><br/>{% trans "New Release Available" %}
         </h6>
-        <small><a href="{{ new_release.url }}">{% trans "NetBox v" %}{{ new_release.version }}</a> {% trans "is available" %}.</small>
+        <small><a href="{{ new_release.url }}">NetBox v{{ new_release.version }}</a> {% trans "is available" %}.</small>
         <hr class="my-2" />
         <small class="mb-0">
-          <a href="https://docs.netbox.dev/en/stable/installation/upgrading/">{% trans "Upgrade Instructions" %}</a>
+          <a href="https://docs.netbox.dev/en/stable/installation/upgrading/">{% trans "Upgrade Instructions" context "Document title" %}</a>
         </small>
       </div>
     </div>
diff --git a/netbox/templates/htmx/delete_form.html b/netbox/templates/htmx/delete_form.html
index cc27e132d..895c27b45 100644
--- a/netbox/templates/htmx/delete_form.html
+++ b/netbox/templates/htmx/delete_form.html
@@ -7,7 +7,7 @@
     <h5 class="modal-title">{% trans "Confirm Deletion" %}</h5>
   </div>
   <div class="modal-body">
-    <p>{% trans "Are you sure you want to" %} <strong class="text-danger">{% trans "delete" %}</strong> {{ object_type }} <strong>{{ object }}</strong>?</p>
+    <p>{% blocktrans %}Are you sure you want to <strong class="text-danger">delete</strong> {{ object_type }} <strong>{{ object }}</strong>?{% endblocktrans %}</p>
     {% render_form form %}
   </div>
   <div class="modal-footer">
diff --git a/netbox/templates/inc/filter_list.html b/netbox/templates/inc/filter_list.html
index 497958345..633cc7439 100644
--- a/netbox/templates/inc/filter_list.html
+++ b/netbox/templates/inc/filter_list.html
@@ -46,7 +46,7 @@
       {% endif %}
     </div>
     <div class="card-footer text-end noprint border-0">
-      <button type="button" class="btn btn-sm btn-outline-danger m-1" {% trans "data-reset-select" %}>
+      <button type="button" class="btn btn-sm btn-outline-danger m-1" data-reset-select>
         <i class="mdi mdi-backspace"></i> {% trans "Reset" %}
       </button>
       <button type="submit" class="btn btn-sm btn-primary m-1">
diff --git a/netbox/templates/inc/messages.html b/netbox/templates/inc/messages.html
index b450a7606..b5d03135f 100644
--- a/netbox/templates/inc/messages.html
+++ b/netbox/templates/inc/messages.html
@@ -1,5 +1,4 @@
 {% load helpers %}
-{% load i18n %}
 
 <div id="django-messages" class="toast-container">
 
diff --git a/netbox/templates/inc/table_controls_htmx.html b/netbox/templates/inc/table_controls_htmx.html
index 7f048d712..e7fd0e7a6 100644
--- a/netbox/templates/inc/table_controls_htmx.html
+++ b/netbox/templates/inc/table_controls_htmx.html
@@ -4,7 +4,7 @@
 <div class="row mb-3">
   <div class="col-auto table-controls noprint">
     <div class="input-group input-group-sm me-2 quicksearch hide-last-child">
-      <input type="search" {% trans "results=5" %} name="q" id="quicksearch" class="form-control" placeholder="Quick search"
+      <input type="search" results="5" name="q" id="quicksearch" class="form-control" placeholder="Quick search"
         hx-get="{{ request.full_path }}" hx-target="#object_list" hx-trigger="keyup changed delay:500ms, search" />
       <button class="btn bg-transparent" type="button" id="quicksearch_clear"><i class="mdi mdi-close-circle"></i></button>
     </div>
diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html
index bd9bd9ea8..0ee630b31 100644
--- a/netbox/templates/ipam/aggregate.html
+++ b/netbox/templates/ipam/aggregate.html
@@ -13,7 +13,7 @@
           <table class="table table-hover attr-table">
             <tr>
               <td>{% trans "Family" %}</td>
-              <td>{% trans "IPv" %}{{ object.family }}</td>
+              <td>IPv{{ object.family }}</td>
             </tr>
             <tr>
               <td>{% trans "RIR" %}</td>
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index c06f29922..c29aa8bc9 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -15,7 +15,7 @@
               <table class="table table-hover attr-table">
                   <tr>
                       <th scope="row">{% trans "Family" %}</th>
-                      <td>{% trans "IPv" %}{{ object.family }}</td>
+                      <td>IPv{{ object.family }}</td>
                   </tr>
                   <tr>
                       <th scope="row">{% trans "VRF" %}</th>
@@ -72,7 +72,7 @@
                       </td>
                   </tr>
                   <tr>
-                      <th scope="row">{% trans "NAT (inside" %})</th>
+                      <th scope="row">{% trans "NAT (inside)" %}</th>
                       <td>
                           {% if object.nat_inside %}
                               {{ object.nat_inside|linkify }}
@@ -85,7 +85,7 @@
                       </td>
                   </tr>
                   <tr>
-                      <th scope="row">{% trans "NAT (Outside" %})</th>
+                      <th scope="row">{% trans "NAT (outside)" %}</th>
                       <td>
                         {% for ip in object.nat_outside.all %}
                           {{ ip|linkify }}
diff --git a/netbox/templates/ipam/iprange.html b/netbox/templates/ipam/iprange.html
index 516e6603e..3e79e6690 100644
--- a/netbox/templates/ipam/iprange.html
+++ b/netbox/templates/ipam/iprange.html
@@ -14,7 +14,7 @@
               <table class="table table-hover attr-table">
                 <tr>
                     <th scope="row">{% trans "Family" %}</th>
-                    <td>{% trans "IPv" %}{{ object.family }}</td>
+                    <td>IPv{{ object.family }}</td>
                 </tr>
                 <tr>
                     <th scope="row">{% trans "Starting Address" %}</th>
diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html
index 82b35c16c..71b240ced 100644
--- a/netbox/templates/ipam/prefix.html
+++ b/netbox/templates/ipam/prefix.html
@@ -13,7 +13,7 @@
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Family" %}</th>
-            <td>{% trans "IPv" %}{{ object.family }}</td>
+            <td>IPv{{ object.family }}</td>
           </tr>
           <tr>
             <th scope="row">{% trans "VRF" %}</th>
diff --git a/netbox/templates/ipam/service_edit.html b/netbox/templates/ipam/service_edit.html
index 084c60b51..1e5fe1a48 100644
--- a/netbox/templates/ipam/service_edit.html
+++ b/netbox/templates/ipam/service_edit.html
@@ -34,7 +34,7 @@
     </div>
     {% render_field form.name %}
     <div class="row">
-        <label class="col-sm-3 col-form-label text-lg-end">{% trans "Port(s" %})</label>
+        <label class="col-sm-3 col-form-label text-lg-end">{% trans "Port(s)" %}</label>
         <div class="col-3">
             {{ form.protocol }}
         </div>
diff --git a/netbox/templates/login.html b/netbox/templates/login.html
index 9c57a2519..b96e26387 100644
--- a/netbox/templates/login.html
+++ b/netbox/templates/login.html
@@ -72,7 +72,7 @@
       <div class="col-1 col-md-auto mb-0"></div>
       <div class="col text-end mb-0">
         <small class="text-muted">
-          {{ settings.HOSTNAME }} ({% trans "v" %}{{ settings.VERSION }})
+          {{ settings.HOSTNAME }} (v{{ settings.VERSION }})
         </small>
       </div>
     </div>
diff --git a/netbox/templates/rest_framework/api.html b/netbox/templates/rest_framework/api.html
index 2b83e978c..a84763f05 100644
--- a/netbox/templates/rest_framework/api.html
+++ b/netbox/templates/rest_framework/api.html
@@ -7,8 +7,8 @@
   <link rel="icon" type="image/png" href="{% static 'rest-api.ico' %}" />
 {% endblock head %}
 
-{% block title %}{% if name %}{{ name }} | {% endif %}{% trans "NetBox REST API" %}{% endblock %}
+{% block title %}{% if name %}{{ name }} | {% endif %}NetBox {% trans "REST API" %}{% endblock %}
 
 {% block branding %}
-  <a class="navbar-brand" href="{% url 'home' %}">{% trans "NetBox" %}</a>
+  <a class="navbar-brand" href="{% url 'home' %}">NetBox</a>
 {% endblock branding %}
diff --git a/netbox/templates/users/account/preferences.html b/netbox/templates/users/account/preferences.html
index de806755e..37ecc7102 100644
--- a/netbox/templates/users/account/preferences.html
+++ b/netbox/templates/users/account/preferences.html
@@ -61,7 +61,7 @@
                 {% for table, prefs in request.user.config.data.tables.items %}
                   <tr>
                     <td>
-                      <input type="checkbox" name="pk" value="{% trans "tables" %}.{{ table }}" class="form-check-input" />
+                      <input type="checkbox" name="pk" value="tables.{{ table }}" class="form-check-input" />
                     </td>
                     <td>{{ table }}</td>
                     <td>{{ prefs.ordering|join:", "|placeholder }}</td>
diff --git a/netbox/templates/virtualization/cluster.html b/netbox/templates/virtualization/cluster.html
index 70976a12c..cc7a14a22 100644
--- a/netbox/templates/virtualization/cluster.html
+++ b/netbox/templates/virtualization/cluster.html
@@ -74,7 +74,7 @@
                   <th scope="row"><i class="mdi mdi-harddisk"></i> {% trans "Disk Space" %}</th>
                   <td>
                       {% if disk_sum %}
-                          {{ disk_sum }} {% trans "GB" %}
+                          {{ disk_sum }} {% trans "GB" context "Abbreviation for gigabyte" %}
                       {% else %}
                           {{ ''|placeholder }}
                       {% endif %}
diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index 9e72ca4b3..04e038b92 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -138,7 +138,7 @@
                         <th scope="row"><i class="mdi mdi-harddisk"></i> {% trans "Disk Space" %}</th>
                         <td>
                             {% if object.disk %}
-                                {{ object.disk }} {% trans "GB" %}
+                                {{ object.disk }} {% trans "GB" context "Abbreviation for gigabyte" %}
                             {% else %}
                                 {{ ''|placeholder }}
                             {% endif %}
diff --git a/netbox/templates/wireless/inc/wirelesslink_interface.html b/netbox/templates/wireless/inc/wirelesslink_interface.html
index 73007996b..322b1225a 100644
--- a/netbox/templates/wireless/inc/wirelesslink_interface.html
+++ b/netbox/templates/wireless/inc/wirelesslink_interface.html
@@ -32,7 +32,7 @@
       <th scope="row">{% trans "Channel Frequency" %}</th>
       <td>
         {% if interface.rf_channel_frequency %}
-          {{ interface.rf_channel_frequency|floatformat:"-2" }} {% trans "MHz" %}
+          {{ interface.rf_channel_frequency|floatformat:"-2" }} {% trans "MHz" context "Abbreviation for megahertz" %}
         {% else %}
           {{ ''|placeholder }}
         {% endif %}
@@ -42,7 +42,7 @@
       <th scope="row">{% trans "Channel Width" %}</th>
       <td>
         {% if interface.rf_channel_width %}
-          {{ interface.rf_channel_width|floatformat:"-3" }} {% trans "MHz" %}
+          {{ interface.rf_channel_width|floatformat:"-3" }} {% trans "MHz" context "Abbreviation for megahertz" %}
         {% else %}
           {{ ''|placeholder }}
         {% endif %}
diff --git a/netbox/templates/wireless/wirelesslink.html b/netbox/templates/wireless/wirelesslink.html
index 4f1f63275..8b1ecfd0d 100644
--- a/netbox/templates/wireless/wirelesslink.html
+++ b/netbox/templates/wireless/wirelesslink.html
@@ -7,7 +7,7 @@
   <div class="row">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Interface A" %}</h5>
+        <h5 class="card-header">{% trans "Interface" %} A</h5>
         <div class="card-body">
           {% include 'wireless/inc/wirelesslink_interface.html' with interface=object.interface_a %}
         </div>
@@ -46,7 +46,7 @@
     </div>
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Interface B" %}</h5>
+        <h5 class="card-header">{% trans "Interface" %} B</h5>
         <div class="card-body">
           {% include 'wireless/inc/wirelesslink_interface.html' with interface=object.interface_b %}
         </div>
diff --git a/netbox/utilities/templates/helpers/table_config_form.html b/netbox/utilities/templates/helpers/table_config_form.html
index 22e36524a..c3a79cfbf 100644
--- a/netbox/utilities/templates/helpers/table_config_form.html
+++ b/netbox/utilities/templates/helpers/table_config_form.html
@@ -36,8 +36,8 @@
           </div>
         </div>
         <div class="modal-footer">
-            <button type="submit" class="btn btn-outline-danger" id="reset_tableconfig" value="{% trans "Reset" %}">{% trans "Reset" %}</button>
-            <button type="submit" class="btn btn-primary" id="save_tableconfig" value="{% trans "Save" %}">{% trans "Save" %}</button>
+            <button type="submit" class="btn btn-outline-danger" id="reset_tableconfig" value="Reset">{% trans "Reset" %}</button>
+            <button type="submit" class="btn btn-primary" id="save_tableconfig" value="Save">{% trans "Save" %}</button>
         </div>
       </form>
     </div>
diff --git a/netbox/utilities/templates/widgets/clearable_file_input.html b/netbox/utilities/templates/widgets/clearable_file_input.html
index 3049c2860..972c86a3f 100644
--- a/netbox/utilities/templates/widgets/clearable_file_input.html
+++ b/netbox/utilities/templates/widgets/clearable_file_input.html
@@ -19,7 +19,7 @@
   name="{{ widget.name }}"
   id="id_{{ widget.name }}"
   accept="{{ widget.attrs.accept }}"
-  {% if widget.required %}{% trans "required" %}{% endif %}
+  {% if widget.required %}required{% endif %}
 />
   </div>
 </div>