diff --git a/InvenTree/build/templates/build/build_base.html b/InvenTree/build/templates/build/build_base.html
index 9da515c2f6..d0e68cac4c 100644
--- a/InvenTree/build/templates/build/build_base.html
+++ b/InvenTree/build/templates/build/build_base.html
@@ -108,7 +108,7 @@ src="{% static 'img/blank_image.png' %}"
         <td>
             {{ build.target_date }}
             {% if build.is_overdue %}
-            <span title='{% trans "This build was due on" %} {{ build.target_date }}' class='label label-red'>{% trans "Overdue" %}</span>
+            <span title='{% blocktrans %}This build was due on {{ build.target_date }}{% endblocktrans %}' class='label label-red'>{% trans "Overdue" %}</span>
             {% endif %}
         </td>
     </tr>
diff --git a/InvenTree/build/templates/build/create_build_item.html b/InvenTree/build/templates/build/create_build_item.html
index 8f58e884d6..1a7934b88b 100644
--- a/InvenTree/build/templates/build/create_build_item.html
+++ b/InvenTree/build/templates/build/create_build_item.html
@@ -8,15 +8,13 @@
     </p>
     {% if output %}
     <p>
-        {% trans "The allocated stock will be installed into the following build output:" %}
-        <br>
-        <i>{{ output }}</i>
+        {% blocktrans %}The allocated stock will be installed into the following build output:<br><i>{{ output }}</i>{% endblocktrans %}
     </p>
     {% endif %}
 </div>
 {% if no_stock %}
 <div class='alert alert-danger alert-block' role='alert'>
-    {% trans "No stock available for" %} {{ part }}
+    {% blocktrans %}No stock available for {{ part }}{% endblocktrans %}
 </div>
 {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/company/templates/company/manufacturer_part_delete.html b/InvenTree/company/templates/company/manufacturer_part_delete.html
index 4d5c2f6c86..98b55934d0 100644
--- a/InvenTree/company/templates/company/manufacturer_part_delete.html
+++ b/InvenTree/company/templates/company/manufacturer_part_delete.html
@@ -33,8 +33,7 @@
 </table>
 {% if part.supplier_parts.all|length > 0 %}
 <div class='alert alert-block alert-danger'>
-<p>There are {{ part.supplier_parts.all|length }} suppliers defined for this manufacturer part. If you delete it, the following supplier parts will also be deleted:
-</p>
+<p>{% blocktrans %}There are {{ part.supplier_parts.all|length }} suppliers defined for this manufacturer part. If you delete it, the following supplier parts will also be deleted:{% endblocktrans %}</p>
 <ul class='list-group' style='margin-top:10px'>
     {% for spart in part.supplier_parts.all %}
     <li class='list-group-item'>{{ spart.supplier.name }} - {{ spart.SKU }}</li>
diff --git a/InvenTree/order/templates/order/order_wizard/select_parts.html b/InvenTree/order/templates/order/order_wizard/select_parts.html
index d3f1796dce..04b3d60a2d 100644
--- a/InvenTree/order/templates/order/order_wizard/select_parts.html
+++ b/InvenTree/order/templates/order/order_wizard/select_parts.html
@@ -54,7 +54,7 @@
                         </select>
                     </div>
                     {% if not part.order_supplier %}
-                    <span class='help-inline'>{% trans "Select a supplier for" %} <i>{{ part.name }}</i></span>
+                    <span class='help-inline'>{% blocktrans %}Select a supplier for <i>{{ part.name }}</i>{% endblocktrans %}</span>
                     {% endif %}
                 </div>
             </td>
diff --git a/InvenTree/order/templates/order/order_wizard/select_pos.html b/InvenTree/order/templates/order/order_wizard/select_pos.html
index 616e618deb..1152736c89 100644
--- a/InvenTree/order/templates/order/order_wizard/select_pos.html
+++ b/InvenTree/order/templates/order/order_wizard/select_pos.html
@@ -42,7 +42,7 @@
                 <button 
                     class='btn btn-default btn-create'
                     id='new_po_{{ supplier.id }}'
-                    title='{% trans "Create new purchase order for {{ supplier.name }}" %}'
+                    title='{% blocktrans %}Create new purchase order for {{ supplier.name }}{% endblocktrans %}'
                     type='button'
                     supplierid='{{ supplier.id }}' 
                     onclick='newPurchaseOrderFromOrderWizard()'>
@@ -65,7 +65,7 @@
                         </select>
                     </div>
                     {% if not supplier.selected_purchase_order %}
-                    <span class='help-inline'>{% trans "Select a purchase order for" %} {{ supplier.name }}</span>
+                    <span class='help-inline'>{% blocktrans %}Select a purchase order for {{ supplier.name }}{% endblocktrans %}</span>
                     {% endif %}
                 </div>
             </td>
diff --git a/InvenTree/order/templates/order/receive_parts.html b/InvenTree/order/templates/order/receive_parts.html
index 3daa9119d8..053851f232 100644
--- a/InvenTree/order/templates/order/receive_parts.html
+++ b/InvenTree/order/templates/order/receive_parts.html
@@ -5,7 +5,7 @@
 
 {% block form %}
 
-{% trans "Receive outstanding parts for" %} <b>{{ order }}</b> - <i>{{ order.description }}</i>
+{% blocktrans %}Receive outstanding parts for <b>{{ order }}</b> - <i>{{ order.description }}</i>{% endblocktrans %}
 
 <form method='post' action='' class='js-modal-form' enctype='multipart/form-data'>
     {% csrf_token %}
diff --git a/InvenTree/part/templates/part/category_delete.html b/InvenTree/part/templates/part/category_delete.html
index b520c321a0..530475d6c7 100644
--- a/InvenTree/part/templates/part/category_delete.html
+++ b/InvenTree/part/templates/part/category_delete.html
@@ -5,7 +5,7 @@
 {% trans 'Are you sure you want to delete category' %} <strong>{{ category.name }}</strong>?
 
 {% if category.children.all|length > 0 %}
-<p>{% trans 'This category contains' %} {{ category.children.all|length }} {% trans 'child categories' %}.<br>
+<p>{% blocktrans %}This category contains {{ category.children.all|length }} child categories{% endblocktrans %}.<br>
 {% trans 'If this category is deleted, these child categories will be moved to the' %}
 {% if category.parent %}
  <strong>{{ category.parent.name }}</strong> {% trans 'category' %}.
@@ -22,9 +22,9 @@
 {% endif %}
 
 {% if category.parts.all|length > 0 %}
-<p>{% trans 'This category contains' %} {{ category.parts.all|length }} {% trans 'parts' %}.<br>
+<p>{% blocktrans %}This category contains {{ category.parts.all|length }} parts{% endblocktrans %}.<br>
     {% if category.parent %}
-    {% trans 'If this category is deleted, these parts will be moved to the parent category' %} {{ category.parent.pathstring }}
+    {% blocktrans %}If this category is deleted, these parts will be moved to the parent category {{ category.parent.pathstring }}{% endblocktrans %}
     {% else %}
     {% trans 'If this category is deleted, these parts will be moved to the top-level category Teile' %}
     {% endif %}
diff --git a/InvenTree/part/templates/part/copy_part.html b/InvenTree/part/templates/part/copy_part.html
index 1d0c04e2cd..b1841275e8 100644
--- a/InvenTree/part/templates/part/copy_part.html
+++ b/InvenTree/part/templates/part/copy_part.html
@@ -7,7 +7,7 @@
 
 <div class='alert alert-info alert-block'>
     <strong>{% trans 'Duplicate Part' %}</strong><br>
-    {% trans 'Make a copy of part' %} '{{ part.full_name }}'.
+    {% blocktrans %}Make a copy of part '{{ part.full_name }}'.{% endblocktrans %}
 </div>
 
 {% if matches %}
diff --git a/InvenTree/part/templates/part/create_part.html b/InvenTree/part/templates/part/create_part.html
index d0e322d887..9cef127079 100644
--- a/InvenTree/part/templates/part/create_part.html
+++ b/InvenTree/part/templates/part/create_part.html
@@ -13,7 +13,8 @@
     <ul class='list-group'>
     {% for match in matches %}
     <li class='list-group-item list-group-item-condensed'>
-        {{ match.part.full_name }} - <i>{{ match.part.description }}</i> ({% decimal match.ratio %}% {% trans "match" %})
+        {% define decimal match.ratio as match_per %}
+        {% blocktrans %}{{ match.part.full_name }} - <i>{{ match.part.description }}</i> ({{match_per}}% match){% endblocktrans %}
     </li>
     {% endfor %}
 </ul>
diff --git a/InvenTree/part/templates/part/part_pricing.html b/InvenTree/part/templates/part/part_pricing.html
index 7865bb2fbe..26779198a6 100644
--- a/InvenTree/part/templates/part/part_pricing.html
+++ b/InvenTree/part/templates/part/part_pricing.html
@@ -5,8 +5,7 @@
 {% block pre_form_content %}
 
 <div class='alert alert-info alert-block'>
-{% trans 'Pricing information for:' %}<br>
-{{ part }}.
+{% blocktrans %}Pricing information for:<br>{{ part }}.{% endblocktrans %}
 </div>
 
 <h4>{% trans 'Quantity' %}</h4>
diff --git a/InvenTree/part/templates/part/partial_delete.html b/InvenTree/part/templates/part/partial_delete.html
index 11910eec66..15ef678849 100644
--- a/InvenTree/part/templates/part/partial_delete.html
+++ b/InvenTree/part/templates/part/partial_delete.html
@@ -4,12 +4,12 @@
 {% block pre_form_content %}
 
 <div class='alert alert-block alert-danger'>
-    {% trans "Are you sure you want to delete part" %} '<b>{{ part.full_name }}</b>'?
+    {% blocktrans %}Are you sure you want to delete part '<b>{{ part.full_name }}</b>'?{% endblocktrans %}
 </div>
 
 {% if part.used_in_count %}
 <hr>
-<p>{% trans "This part is used in BOMs for" %} {{ part.used_in_count }} {% trans "other parts. If you delete this part, the BOMs for the following parts will be updated" %}:
+<p>{% blocktrans %}This part is used in BOMs for {{ part.used_in_count }} other parts. If you delete this part, the BOMs for the following parts will be updated{% endblocktrans %}:
 <ul class="list-group">
     {% for child in part.used_in.all %}
     <li class='list-group-item'>{{ child.part.full_name }} - {{ child.part.description }}</li>
@@ -19,7 +19,7 @@
 
 {% if part.stock_items.all|length > 0 %}
 <hr>
-<p>{% trans "There are" %} {{ part.stock_items.all|length }} {% trans "stock entries defined for this part. If you delete this part, the following stock entries will also be deleted" %}:
+<p>{% blocktrans %}There are {{ part.stock_items.all|length }} stock entries defined for this part. If you delete this part, the following stock entries will also be deleted:{% endblocktrans %}
     <ul class='list-group'>
         {% for stock in part.stock_items.all %}
         <li class='list-group-item'>{{ stock }}</li>
@@ -30,7 +30,7 @@
 
 {% if part.manufacturer_parts.all|length > 0 %}
 <hr>
-<p>{% trans "There are" %} {{ part.manufacturer_parts.all|length }} {% trans "manufacturers defined for this part. If you delete this part, the following manufacturer parts will also be deleted" %}:
+<p>{% blocktrans %}There are {{ part.manufacturer_parts.all|length }} manufacturers defined for this part. If you delete this part, the following manufacturer parts will also be deleted:{% endblocktrans %}
     <ul class='list-group'>
         {% for spart in part.manufacturer_parts.all %}
         <li class='list-group-item'>{{ spart.manufacturer.name }} - {{ spart.MPN }}</li>
@@ -41,7 +41,7 @@
 
 {% if part.supplier_parts.all|length > 0 %}
 <hr>
-<p>{% trans "There are" %} {{ part.supplier_parts.all|length }} {% trans "suppliers defined for this part. If you delete this part, the following supplier parts will also be deleted" %}:
+<p>{% blocktrans %}There are {{ part.supplier_parts.all|length }} suppliers defined for this part. If you delete this part, the following supplier parts will also be deleted:{% endblocktrans %}
     <ul class='list-group'>
         {% for spart in part.supplier_parts.all %}
         <li class='list-group-item'>{{ spart.supplier.name }} - {{ spart.SKU }}</li>
@@ -52,7 +52,7 @@
 
 {% if part.serials.all|length > 0 %}
 <hr>
-<p>{% trans "There are" %} {{ part.serials.all|length }} {% trans "unique parts tracked for" %} '{{ part.full_name }}'. {% trans "Deleting this part will permanently remove this tracking information" %}.</p>
+<p>{% blocktrans %}There are {{ part.serials.all|length }} unique parts tracked for '{{ part.full_name }}'. Deleting this part will permanently remove this tracking information.{% endblocktrans %}</p>
 {% endif %}
 
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/stock.html b/InvenTree/part/templates/part/stock.html
index 2d1385f89c..4870949393 100644
--- a/InvenTree/part/templates/part/stock.html
+++ b/InvenTree/part/templates/part/stock.html
@@ -13,7 +13,7 @@
 {% block details %}
 {% if part.is_template %}
 <div class='alert alert-info alert-block'>
-    {% trans 'Showing stock for all variants of' %} <i>{{ part.full_name }}</i>
+    {% blocktrans %}Showing stock for all variants of <i>{{ part.full_name }}</i>{% endblocktrans %}
 </div>
 {% endif %}
 
diff --git a/InvenTree/part/templates/part/variant_part.html b/InvenTree/part/templates/part/variant_part.html
index f2f8fd4cd7..d326205ba2 100644
--- a/InvenTree/part/templates/part/variant_part.html
+++ b/InvenTree/part/templates/part/variant_part.html
@@ -7,7 +7,7 @@
 
 <div class='alert alert-info alert-block'>
     <b>{% trans "Create new part variant" %}</b><br>
-    {% trans "Create a new variant of template" %} <i>'{{ part.full_name }}'</i>.
+    {% blocktrans %}Create a new variant of template <i>'{{ part.full_name }}'</i>.{% endblocktrans %}
 </div>
 
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index 23397c9886..024532118a 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -366,9 +366,9 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
         <td>
             {{ item.expiry_date }}
             {% if item.is_expired %}
-            <span title='{% trans "This StockItem expired on" %} {{ item.expiry_date }}' class='label label-red'>{% trans "Expired" %}</span>
+            <span title='{% blocktrans %}This StockItem expired on {{ item.expiry_date }}{% endblocktrans %}' class='label label-red'>{% trans "Expired" %}</span>
             {% elif item.is_stale %}
-            <span title='{% trans "This StockItem expires on" %} {{ item.expiry_date }}' class='label label-yellow'>{% trans "Stale" %}</span>
+            <span title='{% blocktrans %}This StockItem expires on {{ item.expiry_date }}{% endblocktrans %}' class='label label-yellow'>{% trans "Stale" %}</span>
             {% endif %}
         </td>
     </tr>
diff --git a/InvenTree/stock/templates/stock/stockitem_convert.html b/InvenTree/stock/templates/stock/stockitem_convert.html
index 55b565a60b..7ad5af1974 100644
--- a/InvenTree/stock/templates/stock/stockitem_convert.html
+++ b/InvenTree/stock/templates/stock/stockitem_convert.html
@@ -5,8 +5,8 @@
 
 <div class='alert alert-block alert-info'>
     <b>{% trans "Convert Stock Item" %}</b><br>
-    {% trans "This stock item is current an instance of " %}<i>{{ item.part }}</i><br>
-    {% trans "It can be converted to one of the part variants listed below." %}
+    {% blocktrans %}This stock item is current an instance of <i>{{ item.part }}</i>{% endblocktrans %}<br>
+    {% blocktrans %}It can be converted to one of the part variants listed below.{% endblocktrans %}
 </div>
 
 <div class='alert alert-block alert-warning'>