diff --git a/shop/search/documents.py b/shop/search/documents.py
new file mode 100644
index 000000000..682890523
--- /dev/null
+++ b/shop/search/documents.py
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.template.loader import select_template
+from django.utils.html import strip_tags
+
+from django_elasticsearch_dsl import fields, Document
+
+from shop.models.product import ProductModel
+
+
+# products = Index('products')
+# products.settings(
+#     number_of_shards=1,
+#     number_of_replicas=0
+# )
+
+
+# @products.document
+class ProductDocument(Document):
+    product_codes = fields.KeywordField(
+        multi=True,
+    )
+
+    product_type = fields.TextField(
+        attr='product_type',
+    )
+
+    body = fields.TextField()
+
+    class Django:
+        model = ProductModel
+        fields = ['id', 'product_name']
+
+    def prepare(self, instance):
+        data = super().prepare(instance)
+        return data
+
+    def get_queryset(self):
+        queryset = super().get_queryset()
+        return queryset.filter(active=True)
+
+    def prepare_product_codes(self, instance):
+        variants = instance.get_product_variants()
+        product_codes = [
+            v.product_code for v in variants if isinstance(getattr(v, 'product_code', None), str)
+        ]
+        if isinstance(getattr(instance, 'product_code', None), str):
+            product_codes.append(instance.product_code)
+        return product_codes
+
+    def prepare_body(self, instance):
+        """
+        Create a textual representation of the product's instance to be used by Elasticsearch for
+        creating a full text search index.
+        """
+        app_label = instance._meta.app_label.lower()
+        params = [
+            (app_label, instance.product_model),
+            (app_label, 'product'),
+            ('shop', 'product'),
+        ]
+        template = select_template(['{0}/search/indexes/{1}.txt'.format(*p) for p in params])
+        body = template.render({'product': instance})
+        print("------------")
+        print(strip_tags(body))
+        return strip_tags(body)
diff --git a/shop/search/indexes.py b/shop/search/indexes.py
deleted file mode 100644
index 11d70f912..000000000
--- a/shop/search/indexes.py
+++ /dev/null
@@ -1,136 +0,0 @@
-from django.conf import settings
-from django.template.loader import select_template
-from django.utils import translation
-from django.utils.html import strip_spaces_between_tags
-from django.utils.safestring import mark_safe
-# from haystack import indexes
-
-from elasticsearch_dsl import analyzer
-from django_elasticsearch_dsl import Document, Index, fields
-from django_elasticsearch_dsl.fields import TextField
-from django_elasticsearch_dsl.registries import registry
-
-from shop.models.product import ProductModel
-
-
-# class ProductIndex(indexes.SearchIndex):
-#     """
-#     Abstract base class used to index all products for this shop
-#     """
-#     text = indexes.CharField(document=True, use_template=True)
-#     autocomplete = indexes.EdgeNgramField(use_template=True)
-#     product_name = indexes.CharField(stored=True, indexed=False, model_attr='product_name')
-#     product_url = indexes.CharField(stored=True, indexed=False, model_attr='get_absolute_url')
-#     categories = indexes.MultiValueField(stored=True, indexed=False)
-#
-#     def get_model(self):
-#         """
-#         Hook to refer to the used Product model. Override this to create indices of
-#         specialized product models.
-#         """
-#         return ProductModel
-#
-#     def prepare(self, product):
-#         if hasattr(product, 'translations'):
-#             product.set_current_language(self.language)
-#         with translation.override(self.language):
-#             data = super(ProductIndex, self).prepare(product)
-#         return data
-#
-#     def prepare_categories(self, product):
-#         category_fields = getattr(product, 'category_fields', [])
-#         category_ids = set(page.pk for field in category_fields for page in getattr(product, field).all())
-#         return category_ids
-#
-#     def render_html(self, prefix, product, postfix):
-#         """
-#         Render a HTML snippet to be stored inside the index database, so that rendering of the
-#         product's list views can be performed without database queries.
-#         """
-#         app_label = product._meta.app_label.lower()
-#         params = [
-#             (app_label, prefix, product.product_model, postfix),
-#             (app_label, prefix, 'product', postfix),
-#             ('shop', prefix, 'product', postfix),
-#         ]
-#         template = select_template(['{0}/products/{1}-{2}-{3}.html'.format(*p) for p in params])
-#         context = {'product': product}
-#         content = strip_spaces_between_tags(template.render(context).strip())
-#         return mark_safe(content)
-#
-#     def index_queryset(self, using=None):
-#         """Used when the entire index for model is updated."""
-#         if using in dict(settings.LANGUAGES):
-#             self.language = using
-#         else:
-#             self.language = settings.LANGUAGE_CODE
-#         return self.get_model().objects.indexable()
-
-
-html_strip = analyzer(
-    'html_strip',
-    tokenizer="standard",
-    filter=["standard", "lowercase", "stop", "snowball"],
-    char_filter=["html_strip"]
-)
-
-
-class ProductDocument(Document):
-    caption = fields.TextField()
-
-    catalog_media = fields.TextField(
-        index=False,
-    )
-
-    search_media = fields.TextField(
-        index=False,
-    )
-
-    product_url = fields.KeywordField(
-        index=False,
-        attr='get_absolute_url',
-    )
-
-    class Django:
-        model = ProductModel
-        fields = ['id', 'product_name']
-
-    # description = fields.TextField(
-    #     analyzer=html_strip,
-    #     fields={
-    #         'raw': fields.TextField(analyzer='keyword'),
-    #     }
-    # )
-    # class Index:
-    #     name = 'products'
-    #     settings = {'number_of_shards': 1, 'number_of_replicas': 0}
-
-    def get_queryset(self):
-        queryset = super().get_queryset()
-        return queryset.filter(active=True)
-
-    def prepare_caption(self, instance):
-        return instance.caption
-
-    def prepare_catalog_media(self, product):
-        return self.render_html('catalog', product, 'media')
-
-    def prepare_search_media(self, product):
-        return self.render_html('search', product, 'media')
-
-    def render_html(self, prefix, product, postfix):
-        """
-        Render a HTML snippet to be stored inside the index database, so that rendering of the
-        product's list views can be performed without database queries.
-        """
-        app_label = product._meta.app_label.lower()
-        params = [
-            (app_label, prefix, product.product_model, postfix),
-            (app_label, prefix, 'product', postfix),
-            ('shop', prefix, 'product', postfix),
-        ]
-        template = select_template(['{0}/products/{1}-{2}-{3}.html'.format(*p) for p in params])
-        context = {'product': product}
-        content = strip_spaces_between_tags(template.render(context).strip())
-        return mark_safe(content)
-
diff --git a/shop/templates/shop/breadcrumb/catalog.html b/shop/templates/shop/breadcrumb/catalog.html
index 8887edf34..532213fa4 100644
--- a/shop/templates/shop/breadcrumb/catalog.html
+++ b/shop/templates/shop/breadcrumb/catalog.html
@@ -9,7 +9,7 @@
 		<ol class="breadcrumb">
 			{% show_breadcrumb 0 "bootstrap4/menu/breadcrumb.html" %}
 			<li class="ml-auto d-none d-sm-inline-block">
-				{% trans "Found Products" %}: <span class="badge badge-primary" djng-bind-if="catalog.count">{{ paginator.count }}</span>
+				{% trans "Found Products" context "breadcrumb" %}: <span class="badge badge-primary" djng-bind-if="catalog.count">{{ paginator.count }}</span>
 			</li>
 		</ol>
 	</nav>
diff --git a/shop/templates/shop/cart/editable.html b/shop/templates/shop/cart/editable.html
index 8ae30c3f8..aa8c7b39f 100644
--- a/shop/templates/shop/cart/editable.html
+++ b/shop/templates/shop/cart/editable.html
@@ -16,7 +16,7 @@
 {% block shop-cart-head %}
 	<div class="row lead text-muted" ng-if="cart.num_items==0">
 		<div class="col">
-			{% trans "There are no items in the cart." %}
+			{% trans "There are no items in the cart." context "cart" %}
 		</div>
 	</div>
 {% endblock shop-cart-head %}
@@ -47,13 +47,13 @@
 					<div class="row">
 						<div class="col mb-2">
 							<button type="button" class="ml-auto btn btn-sm btn-secondary btn-block shop-item-control" ng-click="deleteCartItem(cart_item)">
-								<span class="fa fa-trash-o mr-2"></span>{% trans "Remove" %}
+								<span class="fa fa-trash-o mr-2"></span>{% trans "Remove" context "cart" %}
 							</button>
 						</div>
 		{% if shop_watch_list_url %}
 						<div class="col mb-2">
 							<button type="button" class="ml-auto btn btn-sm btn-info btn-block shop-item-control" ng-click="watchCartItem(cart_item)">
-								<span class="fa fa-heart-o mr-2"></span>{% trans "Watch Item" %}
+								<span class="fa fa-heart-o mr-2"></span>{% trans "Watch Item" context "cart" %}
 							</button>
 						</div>
 		{% endif %}
@@ -70,7 +70,7 @@
 		<div class="col-12 col-md-6 order-md-last border-top">
 			<div class="row py-2 lead">
 				<div class="col text-right text-nowrap">
-					{% trans "Subtotal" %}
+					{% trans "Subtotal" context "cart" %}
 				</div>
 				<div class="col text-right text-nowrap" ng-bind="cart.subtotal">
 					<!-- Subtotal -->
@@ -81,7 +81,7 @@
 				<div class="col text-right text-nowrap" ng-bind="extra_row.amount"></div>
 			</div>
 			<div class="row py-2 shop-double-border lead font-weight-bold">
-				<div class="col text-right text-nowrap">{% trans "Total" %}</div>
+				<div class="col text-right text-nowrap">{% trans "Total" context "cart" %}</div>
 				<div class="col text-right text-nowrap" ng-bind="cart.total">
 					<!-- Total -->
 				</div>
diff --git a/shop/templates/shop/cart/static.html b/shop/templates/shop/cart/static.html
index 944f2da72..b1f598b4c 100644
--- a/shop/templates/shop/cart/static.html
+++ b/shop/templates/shop/cart/static.html
@@ -7,7 +7,7 @@
 	{% if cart.num_items == 0 %}
 	<div class="row lead text-muted py-1">
 		<div class="col">
-			{% trans "There are no items in the cart" %}
+			{% trans "There are no items in the cart." context "cart" %}
 		</div>
 	</div>
 	{% endif %}
@@ -48,7 +48,7 @@
 		<div class="col-12 col-md-6 border-top">
 			<div class="row py-2 lead">
 				<div class="col-6 text-right text-nowrap">
-					{% trans "Subtotal" %}
+					{% trans "Subtotal" context "cart" %}
 				</div>
 				<div class="col-4 col-md-6 text-right text-nowrap" djng-bind-if="cart.subtotal">
 					{{ cart.subtotal }}
@@ -65,7 +65,7 @@
 				<div class="col-4 col-md-6 text-right text-nowrap" ng-bind="extra_row.amount"></div>
 			</div>
 			<div class="row py-2 shop-double-border lead font-weight-bold">
-				<div class="col-6 text-right text-nowrap">{% trans "Total" %}</div>
+				<div class="col-6 text-right text-nowrap">{% trans "Total" context "cart" %}</div>
 				<div class="col-4 col-md-6 text-right text-nowrap" djng-bind-if="cart.total">
 					{{ cart.total }}
 				</div>
diff --git a/shop/templates/shop/cart/summary.html b/shop/templates/shop/cart/summary.html
index 72c6581cc..a6610a54e 100644
--- a/shop/templates/shop/cart/summary.html
+++ b/shop/templates/shop/cart/summary.html
@@ -2,11 +2,11 @@
 
 <ul class="list-group">
 	<li class="list-group-item">
-		<span class="pull-left">{% trans "Number of items" %}:</span>
+		<span class="pull-left">{% trans "Number of items" context "cart" %}:</span>
 		<span class="pull-right font-weight-bold" djng-bind-if="cart.num_items">{{ cart.num_items }}</span>
 	</li>
 	<li class="list-group-item">
-		<span class="pull-left">{% trans "Subtotal" %}:</span>
+		<span class="pull-left">{% trans "Subtotal" context "cart" %}:</span>
 		<span class="pull-right font-weight-bold" djng-bind-if="cart.subtotal">{{ cart.subtotal }}</span>
 	</li>
 {% for extra_row in cart.extra_rows %}
@@ -20,7 +20,7 @@
 		<span class="pull-right font-weight-bold" ng-bind="extra_row.amount"></span>
 	</li>
 	<li class="list-group-item list-group-item-secondary lead font-weight-bold">
-		<span class="pull-left">{% trans "Total" %}:</span>
+		<span class="pull-left">{% trans "Total" context "cart" %}:</span>
 		<span class="pull-right" djng-bind-if="cart.total">{{ cart.total }}</span>
 	</li>
 </ul>
diff --git a/shop/templates/shop/cart/watch.html b/shop/templates/shop/cart/watch.html
index 5db96ce9b..cb4afbd2b 100644
--- a/shop/templates/shop/cart/watch.html
+++ b/shop/templates/shop/cart/watch.html
@@ -10,7 +10,7 @@
 {% block shop-watch-head %}
 	<div class="row lead text-muted" ng-if="cart.items.length==0">
 		<div class="col">
-			{% trans "You are perfectly happy!" %}
+			{% trans "You are perfectly happy!" context "cart" %}
 		</div>
 	</div>
 {% endblock shop-watch-head %}
@@ -26,10 +26,10 @@
 	{% block shop-watch-item-controls %}
 				<div class="col-4 col-md-6">
 					<button type="button" class="ml-auto btn btn-sm btn-secondary btn-block shop-item-control" ng-click="deleteWatchItem(cart_item)">
-						<span class="fa fa-trash-o mr-2"></span>{% trans "Remove" %}
+						<span class="fa fa-trash-o mr-2"></span>{% trans "Remove" context "cart" %}
 					</button>
 					<button type="button" class="ml-auto btn btn-sm btn-info btn-block shop-item-control" ng-click="addWatchItem(cart_item)">
-						<span class="fa fa-cart-arrow-down mr-2"></span>{% trans "Add to cart" %}
+						<span class="fa fa-cart-arrow-down mr-2"></span>{% trans "Add to cart" context "cart" %}
 					</button>
 				</div>
 	{% endblock %}
diff --git a/shop/templates/shop/catalog/available-product-add2cart.html b/shop/templates/shop/catalog/available-product-add2cart.html
index 086777487..54cb03fea 100644
--- a/shop/templates/shop/catalog/available-product-add2cart.html
+++ b/shop/templates/shop/catalog/available-product-add2cart.html
@@ -3,7 +3,7 @@
 
 {% block available-quantity-in-stock %}
 <div class="d-flex flex-column">
-	<span class="label">{% trans "Available" %}</span>
+	<span class="label">{% trans "Available" context "catalog" %}</span>
 	<div class="lead mt-1" ng-cloak>
 	{% verbatim %}{{ context.availability.quantity }}{% endverbatim %}
 	</div>
@@ -12,21 +12,21 @@
 
 {% block change-purchasing-quantity %}
 <div class="d-flex flex-column w-25">
-	<label for="quantity">{% trans "Quantity" %}</label>
+	<label for="quantity">{% trans "Quantity" context "catalog" %}</label>
 	<div class="form-group" ng-show="context.availability.quantity">
 		<input class="form-control" name="quantity" type="number" min="1" max="{% verbatim %}{{ context.availability.quantity }}{% endverbatim %}" ng-model="context.quantity" ng-model-options="{{ ADD2CART_NG_MODEL_OPTIONS }}" ng-change="updateContext()" />
 	</div>
 	<div class="lead mt-1" ng-hide="context.availability.quantity" ng-cloak>
-		{% trans "Currently not available." %}
+		{% trans "Currently not available." context "catalog" %}
 	</div>
 </div>
 {% endblock %}
 
 {% block limited-availability %}
 <div class="text-muted text-left pr-2" ng-show="context.availability.sell_short" ng-cloak>
-	<small>{% trans "Deliverable from {{ context.availability.earliest|date:'d. MMM.' }} onwards." %}</small>
+	<small>{% trans "Deliverable from {{ context.availability.earliest|date:'d. MMM.' }} onwards." context "catalog" %}</small>
 </div>
 <div class="text-muted text-left pr-2" ng-show="context.availability.limited_offer" ng-cloak>
-	<small>{% trans "Available no later than {{ context.availability.latest|date:'d. MMM. H:mm' }}." %}</small>
+	<small>{% trans "Available no later than {{ context.availability.latest|date:'d. MMM. H:mm' }}." context "catalog" %}</small>
 </div>
 {% endblock %}
diff --git a/shop/templates/shop/catalog/bsp-scrollpanel.tmpl.html b/shop/templates/shop/catalog/bsp-scrollpanel.tmpl.html
index f2b8f9d1d..be2751589 100644
--- a/shop/templates/shop/catalog/bsp-scrollpanel.tmpl.html
+++ b/shop/templates/shop/catalog/bsp-scrollpanel.tmpl.html
@@ -1,4 +1,4 @@
-{% load i18n static sekizai_tags sass_tags %}
+{% load static sekizai_tags sass_tags %}
 {% addtoblock "css" %}<link href="{% sass_src 'shop/css/product-gallery.scss' %}" rel="stylesheet" type="text/css" />{% endaddtoblock %}
 {% addtoblock "js" %}<script src="{% static 'node_modules/angular-bootstrap-plus/src/scrollpanel/scrollpanel.js' %}" type="text/javascript"></script>{% endaddtoblock %}
 {% add_data "ng-requires" "bs-plus.scrollpanel" %}
diff --git a/shop/templates/shop/catalog/list.html b/shop/templates/shop/catalog/list.html
index 0cdecb448..080842433 100644
--- a/shop/templates/shop/catalog/list.html
+++ b/shop/templates/shop/catalog/list.html
@@ -1,4 +1,4 @@
-{% load i18n static sekizai_tags sass_tags %}
+{% load static sekizai_tags sass_tags %}
 
 {% addtoblock "js" %}<script src="{% static 'shop/js/utils.js' %}" type="text/javascript"></script>{% endaddtoblock %}
 {% addtoblock "js" %}<script src="{% static 'shop/js/catalog.js' %}" type="text/javascript"></script>{% endaddtoblock %}
diff --git a/shop/templates/shop/catalog/pagination.html b/shop/templates/shop/catalog/pagination.html
index e58fb6709..286df1aed 100644
--- a/shop/templates/shop/catalog/pagination.html
+++ b/shop/templates/shop/catalog/pagination.html
@@ -4,7 +4,7 @@
 	{% addtoblock "css" %}<link href="{% sass_src 'shop/css/prevent-widows.scss' %}" rel="stylesheet" type="text/css" />{% endaddtoblock %}
 
 	{% if paginator.display_page_controls %}
-<nav ng-if="catalog.count===undefined" class="mb-3" aria-label="{% trans 'Page navigation' %}">
+<nav ng-if="catalog.count===undefined" class="mb-3" aria-label="{% trans "Page navigation" context "catalog" %}">
 	<ul class="pagination justify-content-center">{{ paginator.to_html }}</ul>
 </nav>
 	{% endif %}
@@ -14,27 +14,27 @@
 	{% add_data "ng-requires" "angular-inview" %}
 
 	{% if paginator.display_page_controls %}
-<nav ng-if="catalog.count===undefined" class="mb-3" aria-label="{% trans 'Page navigation' %}">
+<nav ng-if="catalog.count===undefined" class="mb-3" aria-label="{% trans "Page navigation" context "catalog" %}">
 	<ul class="pagination justify-content-center"{% if pagination != "paginator" %} in-view="$inview && loadMore()"{% endif %}>{{ paginator.to_html }}</ul>
 </nav>
 	{% endif %}
 
 <div ng-if="catalog.count>0" class="text-center mb-3" ng-cloak>
 	<span class="btn btn-outline-dark" ng-if="isLoading">
-		{% trans "Loading more products" %}&emsp;<i class="fa fa-spinner fa-spin"></i>
+		{% trans "Loading more products" context "catalog" %}&emsp;<i class="fa fa-spinner fa-spin"></i>
 	</span>
 	<span ng-if="!isLoading">
 	{% if pagination == "auto" %}
 		<i in-view="$inview && loadMore()">&nbsp;</i>
 	{% else %}
 		<button type="button" class="btn btn-outline-secondary" ng-hide="catalog.products.length==catalog.count" ng-click="loadMore()">
-			{% trans "Load more products" %}
+			{% trans "Load more products" context "catalog" %}
 		</button>
 	{% endif %}
 	</span>
 </div>
 <div ng-if="catalog.count===0" class="text-center mb-3" ng-cloak>
-	<span class="btn btn-outline-dark">{% trans "No products found" %}</span>
+	<span class="btn btn-outline-dark">{% trans "No products found" context "catalog" %}</span>
 </div>
 
 {% endif %}
diff --git a/shop/templates/shop/catalog/product-add2cart.html b/shop/templates/shop/catalog/product-add2cart.html
index 643a467ba..866ec8067 100644
--- a/shop/templates/shop/catalog/product-add2cart.html
+++ b/shop/templates/shop/catalog/product-add2cart.html
@@ -15,7 +15,7 @@
 <div class="card {{ card_css_classes }} {{ instance.css_classes }}"{% if inline_styles %} style="{{ inline_styles }}"{% endif %} shop-add-to-cart="{% block add-to-cart-url %}{{ product.get_absolute_url }}/add-to-cart{% endblock %}">
 
 	<div class="card-header">
-	{% blocktrans with product_name=product.product_name %}Add {{ product_name }} to cart{% endblocktrans %}
+	{% blocktrans with product_name=product.product_name context "catalog" %}Add {{ product_name }} to cart{% endblocktrans %}
 	</div>
 
 	{% block add-product-to-cart-body %}
@@ -24,7 +24,7 @@
 		{% block available-quantity-in-stock %}{% endblock %}
 		{% block change-purchasing-quantity %}
 			<div class="d-flex flex-column w-25">
-				<label for="quantity">{% trans "Quantity" %}</label>
+				<label for="quantity">{% trans "Quantity" context "catalog" %}</label>
 				<div class="form-group">
 					<input class="form-control" name="quantity" type="number" min="1" ng-model="context.quantity" ng-model-options="{{ ADD2CART_NG_MODEL_OPTIONS }}" ng-change="updateContext()" />
 				</div>
@@ -32,7 +32,7 @@
 		{% endblock %}
 		{% block product-unit-price %}
 			<div class="d-flex flex-column">
-				<span class="label">{% trans "Unit Price" %}</span>
+				<span class="label">{% trans "Unit Price" context "catalog" %}</span>
 				<div class="lead mt-1" ng-cloak>
 				{% verbatim %}{{ context.unit_price }}{% endverbatim %}
 				</div>
@@ -40,7 +40,7 @@
 		{% endblock %}
 		{% block purchase-item-subtotal %}
 			<div class="d-flex flex-column">
-				<span class="label">{% trans "Subtotal" %}</span>
+				<span class="label">{% trans "Subtotal" context "catalog" %}</span>
 				<div class="lead mt-1 font-weight-bold" ng-cloak>
 				{% verbatim %}{{ context.subtotal }}<sup>*</sup>{% endverbatim %}
 				</div>
@@ -51,7 +51,7 @@
 		{% block limited-availability %}{% endblock %}
 		{% block unmentioned-costs %}
 			<div class="flex-grow-1 text-muted text-right mb-3">
-				<small><sup>*</sup>&nbsp;{% trans "incl. VAT, plus shipping costs." %}</small>
+				<small><sup>*</sup>&nbsp;{% trans "incl. VAT, plus shipping costs." context "catalog" %}</small>
 			</div>
 		{% endblock %}
 		</div>
@@ -62,18 +62,18 @@
 	<div class="card-footer bg-white">
 		<div class="d-flex flex-column flex-lg-row justify-content-between">
 			<button class="btn btn-secondary m-1" ng-disabled="context.is_in_cart" ng-click="do(addToCart('{% url "shop:watch-list" %}'))">
-				{% trans "Watch product" %}
+				{% trans "Watch product" context "catalog" %}
 				<i class="fa" ng-class="context.is_in_cart ? 'fa-heart' : 'fa-heart-o'"></i>
 			</button>
 		{% url "shop:cart-list" as cart_endpoint %}{% trans "The product has been successfully placed in the shopping cart:" as modal_title %}
 			<button class="btn btn-primary m-1" ng-disabled="!context.availability.quantity" ng-click="{% if use_modal_dialog %}do(openModal('{{ modal_title }}')).then(addToCart('{{ cart_endpoint }}')).then(redirectTo()){% else %}do(addToCart('{{ cart_endpoint }}')).then(emit('shop.cart.change')){% endif %}">
-				{% trans "Add to cart" %}
+				{% trans "Add to cart" context "catalog" %}
 				<i class="fa fa-cart-arrow-down"></i>
 			</button>
 		</div>
 		{% if request.session.is_empty %}
 		<small class="text-muted m-1">{% block cookie-disclaimer %}
-			{% blocktrans %}By adding a product to the cart you are giving consent to cookies being used.{% endblocktrans %}
+			{% blocktrans context "catalog" %}By adding a product to the cart you are giving consent to cookies being used.{% endblocktrans %}
 		{% endblock %}</small>
 		{% endif %}
 	</div>
@@ -93,7 +93,7 @@ <h4 class="modal-title" ng-bind="context.modalTitle"></h4>
 	{% block add-to-cart-modal-body %}
 	<div class="modal-body" ng-cloak>
 		{% verbatim %}{{ context.quantity|number }} &times; {% endverbatim %}{{ product.product_name }}
-		{% trans "for {{ context.unit_price }} per piece: {{ context.subtotal }}" %}
+		{% trans "for {{ context.unit_price }} per piece: {{ context.subtotal }}" context "catalog" %}
 	</div>
 	{% endblock add-to-cart-modal-body %}
 
@@ -101,10 +101,10 @@ <h4 class="modal-title" ng-bind="context.modalTitle"></h4>
 		{% page_url "shop-cart" as shop_cart_url %}{% if not shop_cart_url %}{% url "shop-cart" as shop_cart_url %}{% endif %}
 	<div class="modal-footer">
 		{% if shop_cart_url %}
-		<button class="btn btn-primary" ng-click="proceed('{{ shop_cart_url }}')">{% trans "Show Cart" %}</button>
+		<button class="btn btn-primary" ng-click="proceed('{{ shop_cart_url }}')">{% trans "Show Cart" context "catalog" %}</button>
 		{% endif %}
-		<button class="btn btn-primary" ng-click="proceed('{{ request.current_page.get_absolute_url }}')">{% trans "Continue Shopping" %}</button>
-		<button class="btn btn-warning" ng-click="cancel()">{% trans "Cancel" %}</button>
+		<button class="btn btn-primary" ng-click="proceed('{{ request.current_page.get_absolute_url }}')">{% trans "Continue Shopping" context "catalog" %}</button>
+		<button class="btn btn-warning" ng-click="cancel()">{% trans "Cancel" context "catalog" %}</button>
 	</div>
 	{% endblock add-to-cart-modal-footer %}
 </script>
diff --git a/shop/templates/shop/catalog/product-figure.html b/shop/templates/shop/catalog/product-figure.html
index e29d4e5f2..05f83dc5d 100644
--- a/shop/templates/shop/catalog/product-figure.html
+++ b/shop/templates/shop/catalog/product-figure.html
@@ -7,7 +7,7 @@
 	</a>
 	<figcaption class="figure-caption mt-2">
 	{% block figcaption %}
-		<div class="lead">{% trans "Price" %}: <strong{% if ng %} ng-bind="product.price"{% endif %}>{{ product.price }}</strong></div>
+		<div class="lead">{% trans "Price" context "catalog" %}: <strong{% if ng %} ng-bind="product.price"{% endif %}>{{ product.price }}</strong></div>
 		<div{% if ng %} ng-bind-html="product.caption"{% endif %}>{{ product.caption|safe }}</div>
 	{% endblock figcaption %}
 	</figcaption>
diff --git a/shop/templates/shop/checkout/billing-address-form.html b/shop/templates/shop/checkout/billing-address-form.html
index 3c016c7ef..b1b9f0d97 100644
--- a/shop/templates/shop/checkout/billing-address-form.html
+++ b/shop/templates/shop/checkout/billing-address-form.html
@@ -27,12 +27,12 @@
 	{% if billing_address_form.multi_addr %}
 		<input type="hidden" name="siblings_summary" ng-model="billing_address.siblings_summary" ng-init="billing_address.siblings_summary={{ billing_address_form.siblings_summary|rest_json|force_escape }};" />
 		<div class="form-group" ng-show="billing_address.siblings_summary.length>0">
-			<label for="billing_address_active_priority">{% trans "Choose a previously used billing address" %}</label>
+			<label for="billing_address_active_priority">{% trans "Choose a previously used billing address" context "catalog" %}</label>
 			<select id="billing_address_active_priority" class="form-control input-sm" name="active_priority" ng-change="switchSiblingAddress(billing_address.active_priority)" ng-model="billing_address.active_priority">
 				{% verbatim %}
 				<option ng-repeat="addr in billing_address.siblings_summary" value="{{ addr.value }}">{{ addr.label }}</option>
 				{% endverbatim %}
-				<option value="add">{% trans "Add a new billing address" %}</option>
+				<option value="add">{% trans "Add a new billing address" context "checkout" %}</option>
 			</select>
 		</div>
 	{% endif %}
@@ -42,7 +42,7 @@
 	{% if billing_address_form.multi_addr %}
 		<div class="form-group" ng-show="billing_address.siblings_summary.length>1 || billing_address.siblings_summary.length>0 && billing_address.active_priority=='add'">
 			<button class="btn btn-danger btn-sm" ng-click="deleteSiblingAddress()">
-				<span class="fa fa-trash mr-2"></span>{% trans "Remove this address" %}
+				<span class="fa fa-trash mr-2"></span>{% trans "Remove this address" context "checkout" %}
 			</button>
 		</div>
 	{% endif %}
diff --git a/shop/templates/shop/checkout/payment-method-form.html b/shop/templates/shop/checkout/payment-method-form.html
index e7bdba5ef..bc46c5a60 100644
--- a/shop/templates/shop/checkout/payment-method-form.html
+++ b/shop/templates/shop/checkout/payment-method-form.html
@@ -19,16 +19,16 @@
 	{% if show_additional_charge %}
 	<ul class="additional-charge">
 		{% for choice, label in payment_method_form.payment_modifier.field.choices %}
-		<li ng-repeat="extra_row in cart.extra_rows|filter:{modifier:'{{ choice }}'}">{% trans "Additional charge" %}: {% verbatim %}{{ extra_row.amount }}{% endverbatim %}</li>
+		<li ng-repeat="extra_row in cart.extra_rows|filter:{modifier:'{{ choice }}'}">{% trans "Additional charge: {{ extra_row.amount }}" context "checkout" %}</li>
 		{% endfor %}
 		{% if payment_modifiers.initial_row %}
-		<li ng-if="!cart.extra_rows">{% trans "Additional charge" %}: {{ payment_modifiers.initial_row.amount }}</li>
+		<li ng-if="!cart.extra_rows">{% blocktrans with amount=payment_modifiers.initial_row.amount context "checkout" %}Additional charge: {{ amount }}{% endblocktrans %}</li>
 		{% endif %}
 	</ul>
 	{% endif %}
 {% else %}
 	<input name="__force_invalidation__" style="display: none;" required />
-	<p class="bg-danger">{% trans "No payment method available" %}</p>
+	<p class="bg-danger">{% trans "No payment method available" context "checkout" %}</p>
 {% endif %}
 </form>
 	{% block payment-provider-form %}
diff --git a/shop/templates/shop/checkout/purchase-button.html b/shop/templates/shop/checkout/purchase-button.html
index 378dd2d90..0054878f5 100644
--- a/shop/templates/shop/checkout/purchase-button.html
+++ b/shop/templates/shop/checkout/purchase-button.html
@@ -7,7 +7,7 @@
 {% add_data "ng-requires" "django.shop.purchase-button" %}
 
 <div class="alert alert-danger" ng-show="purchasingErrorMessage" role="alert" ng-cloak>
-	<a class="close" ng-click="purchasingErrorMessage=null" uib-tooltip="{% trans 'Dismiss' %}">×</a>{% verbatim %}{{ purchasingErrorMessage }}{% endverbatim %}
+	<a class="close" ng-click="purchasingErrorMessage=null" uib-tooltip="{% trans "Dismiss" context "checkout" %}">×</a>{% verbatim %}{{ purchasingErrorMessage }}{% endverbatim %}
 </div>
 
 {% with instance_css_classes=instance.css_classes instance_inline_styles=instance.inline_styles disable_invalid=instance.glossary.disable_invalid %}
diff --git a/shop/templates/shop/checkout/required-form-fields.html b/shop/templates/shop/checkout/required-form-fields.html
index b338a77f7..78c17f61c 100644
--- a/shop/templates/shop/checkout/required-form-fields.html
+++ b/shop/templates/shop/checkout/required-form-fields.html
@@ -1 +1 @@
-{% load i18n %}<p><label>*&nbsp;{% trans "These fields are required" %}</label></p>
\ No newline at end of file
+{% load i18n %}<p><label>*&nbsp;{% trans "These fields are required." context "checkout" %}</label></p>
diff --git a/shop/templates/shop/checkout/shipping-address-form.html b/shop/templates/shop/checkout/shipping-address-form.html
index 9b8036e25..f2af19637 100644
--- a/shop/templates/shop/checkout/shipping-address-form.html
+++ b/shop/templates/shop/checkout/shipping-address-form.html
@@ -28,12 +28,12 @@
 	{% if shipping_address_form.multi_addr %}
 		<input type="hidden" name="siblings_summary" ng-model="shipping_address.siblings_summary" ng-init="shipping_address.siblings_summary={{ shipping_address_form.siblings_summary|rest_json|force_escape }};" />
 		<div class="form-group" ng-show="shipping_address.siblings_summary.length>0">
-			<label for="shipping_address_active_priority">{% trans "Choose a previously used shipping address" %}</label>
+			<label for="shipping_address_active_priority">{% trans "Choose a previously used shipping address" context "checkout" %}</label>
 			<select id="shipping_address_active_priority" class="form-control input-sm" name="active_priority" ng-change="switchSiblingAddress(shipping_address.active_priority)" ng-model="shipping_address.active_priority">
 				{% verbatim %}
 				<option ng-repeat="addr in shipping_address.siblings_summary" value="{{ addr.value }}">{{ addr.label }}</option>
 				{% endverbatim %}
-				<option value="add">{% trans "Add a new shipping address" %}</option>
+				<option value="add">{% trans "Add a new shipping address" context "checkout" %}</option>
 			</select>
 		</div>
 	{% endif %}
@@ -43,7 +43,7 @@
 	{% if shipping_address_form.multi_addr %}
 		<div class="form-group" ng-show="shipping_address.siblings_summary.length>1 || shipping_address.siblings_summary.length>0 && shipping_address.active_priority=='add'">
 			<button class="btn btn-danger btn-sm" ng-click="deleteSiblingAddress()">
-				<span class="fa fa-trash mr-2"></span>{% trans "Remove this address" %}
+				<span class="fa fa-trash mr-2"></span>{% trans "Remove this address" context "checkout" %}
 			</button>
 		</div>
 	{% endif %}
diff --git a/shop/templates/shop/checkout/shipping-method-form.html b/shop/templates/shop/checkout/shipping-method-form.html
index 7cb8b0f06..5c588145e 100644
--- a/shop/templates/shop/checkout/shipping-method-form.html
+++ b/shop/templates/shop/checkout/shipping-method-form.html
@@ -19,16 +19,16 @@
 	{% if show_additional_charge %}
 	<ul class="additional-charge">
 		{% for choice, label in shipping_method_form.shipping_modifier.field.choices %}
-		<li ng-repeat="extra_row in cart.extra_rows|filter:{modifier:'{{ choice }}'}">{% trans "Additional charge" %}: {% verbatim %}{{ extra_row.amount }}{% endverbatim %}</li>
+		<li ng-repeat="extra_row in cart.extra_rows|filter:{modifier:'{{ choice }}'}">{% trans "Additional charge: {{ extra_row.amount }}" context "checkout" %}</li>
 		{% endfor %}
 		{% if shipping_modifiers.initial_row %}
-		<li ng-if="!cart.extra_rows">{% trans "Additional charge" %}: {{ shipping_modifiers.initial_row.amount }}</li>
+		<li ng-if="!cart.extra_rows">{% blocktrans with amount=shipping_modifiers.initial_row.amount context "checkout" %}Additional charge: {{ amount }}{% endblocktrans %}</li>
 		{% endif %}
 	</ul>
 	{% endif %}
 {% else %}
 	<input name="__force_invalidation__" style="display: none;" required />
-	<p class="bg-danger">{% trans "No shipping method available" %}</p>
+	<p class="bg-danger">{% trans "No shipping method available" context "checkout" %}</p>
 {% endif %}
 </form>
 	{% block shipping-provider-form %}{% endblock %}
diff --git a/shop/templates/shop/order/addendum-form.html b/shop/templates/shop/order/addendum-form.html
index 4ef2cc9a0..f611ac0a8 100644
--- a/shop/templates/shop/order/addendum-form.html
+++ b/shop/templates/shop/order/addendum-form.html
@@ -10,7 +10,7 @@
 	{% endblocktrans %}</p>
 {% else %}
 	{% if show_history and data.extra.addendum %}
-		<label>{% trans "Previous annotations" %}</label>
+		<label>{% trans "Previous annotations" context "order" %}</label>
 		<dl class="dl-horizontal">
 		{% for timestamp, annotation in data.extra.addendum %}
 			<dt shop-timestamp="{{ timestamp }}" time-format="d. MMM yyyy, HH:mm"></dt>
diff --git a/shop/templates/shop/order/cancel-button.html b/shop/templates/shop/order/cancel-button.html
index 72ae5460d..95ac48c7e 100644
--- a/shop/templates/shop/order/cancel-button.html
+++ b/shop/templates/shop/order/cancel-button.html
@@ -20,7 +20,7 @@
 	</form>
 {% else %}
 	<div class="{{ instance_css_classes }} disabled">
-		{% trans "This Order can't be cancelled" %}
+		{% trans "This Order can't be cancelled" context "order" %}
 	</div>
 {% endif %}
 	{% endwith %}
diff --git a/shop/templates/shop/order/detail.html b/shop/templates/shop/order/detail.html
index 09cf81b4d..2378861de 100644
--- a/shop/templates/shop/order/detail.html
+++ b/shop/templates/shop/order/detail.html
@@ -8,8 +8,8 @@
 
 {% block shop-order-title %}
 <div class="d-flex align-items-center flex-wrap">
-	<h4 class="text-nowrap">{% trans "Order" %} {{ data.number }}</h4>
-	<div class="text-nowrap ml-3">{% trans "from" context "order-detail" %} <span shop-timestamp="{{ data.created_at }}"></span></div>
+	<h4 class="text-nowrap">{% blocktrans with number=data.number context "order" %}Order {{ number }}{% endblocktrans %}</h4>
+	<div class="text-nowrap ml-3">{% trans "from" context "order" %} <span shop-timestamp="{{ data.created_at }}"></span></div>
 	<div class="ml-auto lead badge badge-primary">{{ data.status }}</div>
 </div>
 {% endblock %}
@@ -18,27 +18,27 @@ <h4 class="text-nowrap">{% trans "Order" %} {{ data.number }}</h4>
 <div class="row mb-3">
 	<div class="col-12 col-lg-6 my-2">
 		<div class="card">
-			<h5 class="card-header">{% trans "Shipping Address" %}</h5>
+			<h5 class="card-header">{% trans "Shipping Address" context "order" %}</h5>
 			<div class="card-body">
 				<pre class="card-text">{{ data.shipping_address_text }}</pre>
 			</div>
-			<div class="card-footer text-primary">{% trans "Shipping Method" %}: {{ data.active_shipping_method.label }}</div>
+			<div class="card-footer text-primary">{% blocktrans with label=data.active_shipping_method.label context "order" %}Shipping Method: {{ label }}{% endblocktrans %}</div>
 		</div>
 	</div>
 	<div class="col-12 col-lg-6 my-2">
 		<div class="card">
-			<h5 class="card-header">{% trans "Billing Address" %}</h5>
+			<h5 class="card-header">{% trans "Billing Address" context "order" %}</h5>
 			<div class="card-body">
 				<pre class="card-text">{{ data.billing_address_text }}</pre>
 			</div>
-			<div class="card-footer text-primary">{% trans "Payment Method" %}: {{ data.active_payment_method.label }}</div>
+			<div class="card-footer text-primary">{% blocktrans with label=data.active_payment_method.label context "order" %}Payment Method: {{ label }}{% endblocktrans %}</div>
 		</div>
 	</div>
 </div>
 {% endblock %}
 
 {% block shop-order-head %}
-<h4>{% trans "Ordered Items" %}</h4>
+<h4>{% trans "Ordered Items" context "order" %}</h4>
 {% endblock shop-order-head %}
 
 {% block shop-order-body %}
@@ -73,7 +73,7 @@ <h4>{% trans "Ordered Items" %}</h4>
 	<div class="col-12 col-md-6 border-top order-md-last">
 		<div class="row py-2 lead">
 			<div class="col-6 text-right text-nowrap">
-				{% trans "Subtotal" %}
+				{% trans "Subtotal" context "order" %}
 			</div>
 			<div class="col-4 col-md-6 text-right text-nowrap">
 				{{ data.subtotal }}
@@ -86,7 +86,7 @@ <h4>{% trans "Ordered Items" %}</h4>
 		</div>
 	{% endfor %}
 		<div class="row py-2 shop-double-border lead font-weight-bold">
-			<div class="col-6 text-right text-nowrap">{% trans "Total" %}</div>
+			<div class="col-6 text-right text-nowrap">{% trans "Total" context "order" %}</div>
 			<div class="col-4 col-md-6 text-right text-nowrap">{{ data.total }}</div>
 		</div>
 	{% if instance.right_extension %}{% render_plugin instance.right_extension %}{% endif %}