diff --git a/plinth/modules/apps/templates/apps.html b/plinth/modules/apps/templates/apps.html
index a421386f2..d22661bc5 100644
--- a/plinth/modules/apps/templates/apps.html
+++ b/plinth/modules/apps/templates/apps.html
@@ -25,9 +25,9 @@
   <h2>{% trans "Services and Applications" %}</h2>
 
   <p>
-    {% blocktrans trimmed %}
+    {% blocktrans trimmed with box_name=cfg.box_name %}
       You can install and run various services and applications on
-      your {{ cfg.box_name }}.
+      your {{ box_name }}.
     {% endblocktrans %}
   </p>
 
diff --git a/plinth/modules/firewall/templates/firewall.html b/plinth/modules/firewall/templates/firewall.html
index 14c21f4f9..2a2826032 100644
--- a/plinth/modules/firewall/templates/firewall.html
+++ b/plinth/modules/firewall/templates/firewall.html
@@ -25,10 +25,10 @@
   <h2>{{ title }}</h2>
 
   <p>
-    {% blocktrans trimmed %}
+    {% blocktrans trimmed with box_name=cfg.box_name %}
       Firewall is a network security system that controls the incoming
-      and outgoing network traffic on your {{ cfg.box_name }}. Keeping
-      a firewall enabled and properly configured reduces risk of
+      and outgoing network traffic on your {{ box_name }}. Keeping a
+      firewall enabled and properly configured reduces risk of
       security threat from the Internet.
     {% endblocktrans %}
   </p>
@@ -38,10 +38,10 @@
   {% if firewall_status = 'not_running' %}
 
     <p>
-      {% blocktrans trimmed %}
+      {% blocktrans trimmed with box_name=cfg.box_name %}
         Firewall daemon is not running. Please run it. Firewall comes
-        enabled by default on {{ cfg.box_name }}. On any Debian based
-        system (such as {{ cfg.box_name }}) you may run it using the
+        enabled by default on {{ box_name }}. On any Debian based
+        system (such as {{ box_name }}) you may run it using the
         command 'service firewalld start' or in case of a system with
         systemd 'systemctl start firewalld'
       {% endblocktrans %}
diff --git a/plinth/modules/help/templates/help_index.html b/plinth/modules/help/templates/help_index.html
index 9a599aaa9..fbe4682ad 100644
--- a/plinth/modules/help/templates/help_index.html
+++ b/plinth/modules/help/templates/help_index.html
@@ -26,9 +26,9 @@
 
   <p>
     {% url 'help:manual' as manual_url %}
-    {% blocktrans trimmed %}
+    {% blocktrans trimmed with box_name=cfg.box_name %}
       The <a href="{{ manual_url }}">FreedomBox Manual</a> is the
-      best place to start for information regarding {{ cfg.box_name }}.
+      best place to start for information regarding {{ box_name }}.
     {% endblocktrans %}
   </p>
 
diff --git a/plinth/modules/networks/templates/connection_show.html b/plinth/modules/networks/templates/connection_show.html
index 3d58aef2a..b0ce539f6 100644
--- a/plinth/modules/networks/templates/connection_show.html
+++ b/plinth/modules/networks/templates/connection_show.html
@@ -132,7 +132,9 @@
           <div class="list-group-item">
             {% trans "Speed" %}
             <span class="pull-right">
-              {% blocktrans %}{{ device.ethernet.speed }} Mbit/s{% endblocktrans %}
+              {% blocktrans trimmed with ethernet_speed=device.ethernet.speed %}
+                {{ ethernet_speed }} Mbit/s
+              {% endblocktrans %}
             </span>
           </div>
         {% endif %}
@@ -146,7 +148,9 @@
             <div class="list-group-item">
               {% trans "Speed" %}
               <span class="pull-right">
-                {% blocktrans %}{{ device.wireless.bitrate }} Mbit/s{% endblocktrans %}
+                {% blocktrans trimmed with wireless_bitrate=device.wireless.bitrate %}
+                  {{ wireless_bitrate }} Mbit/s
+                {% endblocktrans %}
               </span>
             </div>
             <div class="list-group-item">
diff --git a/plinth/modules/networks/templates/connections_diagram.html b/plinth/modules/networks/templates/connections_diagram.html
index a80ace507..37e3baf70 100644
--- a/plinth/modules/networks/templates/connections_diagram.html
+++ b/plinth/modules/networks/templates/connections_diagram.html
@@ -116,7 +116,7 @@
                    class="network-type-icon" alt="{% trans "Wi-Fi" %}"/>
             {% endif %}
             <a href="{% url 'networks:show' connection.uuid %}"
-               title="{% blocktrans %}Show connection {{ connection.name }}{% endblocktrans %}">
+               title="{% blocktrans with name=connection.name %}Show connection {{ name }}{% endblocktrans %}">
               {{ connection.name }} ({{ connection.interface_name }})</a>
           </p>
         {% endif %}
diff --git a/plinth/modules/networks/templates/connections_list.html b/plinth/modules/networks/templates/connections_list.html
index 054b70844..25f569e03 100644
--- a/plinth/modules/networks/templates/connections_list.html
+++ b/plinth/modules/networks/templates/connections_list.html
@@ -64,7 +64,7 @@
             <a href="{% url 'networks:delete' connection.uuid %}"
                class="btn btn-default btn-sm pull-right"
                role="button"
-               title="{% blocktrans %}Delete connection {{ connection.name }}{% endblocktrans %}">
+               title="{% blocktrans with name=connection.name %}Delete connection {{ name }}{% endblocktrans %}">
               <span class="glyphicon glyphicon-trash"
                     aria-hidden="true"></span>
             </a>
diff --git a/plinth/modules/openvpn/templates/openvpn.html b/plinth/modules/openvpn/templates/openvpn.html
index 4ea98a74d..ef792ff3d 100644
--- a/plinth/modules/openvpn/templates/openvpn.html
+++ b/plinth/modules/openvpn/templates/openvpn.html
@@ -35,15 +35,14 @@
   <h2>{% trans "Virtual Private Network (OpenVPN)" %}</h2>
 
   <p>
-    {% blocktrans trimmed %}
+    {% blocktrans trimmed with box_name=cfg.box_name %}
       Virtual Private Network (VPN) is a technique for securely
       connecting two machines in order to access resources of a
       private network.  While you are away from home, you can connect
-      to your {{ cfg.box_name }} in order to join your home network
-      and access private/internal services provided by
-      {{ cfg.box_name }}.  You can also access the rest of the
-      Internet via {{ cfg.box_name }} for added security and
-      anonymity.
+      to your {{ box_name }} in order to join your home network and
+      access private/internal services provided by {{ box_name }}.
+      You can also access the rest of the Internet via {{ box_name }}
+      for added security and anonymity.
     {% endblocktrans %}
   </p>
 
@@ -52,8 +51,8 @@
     <h3>{% trans "Profile" %}</h3>
 
     <p>
-      {% blocktrans trimmed %}
-        To connect to {{ cfg.box_name }}'s VPN, you need to download a
+      {% blocktrans trimmed with box_name=cfg.box_name %}
+        To connect to {{ box_name }}'s VPN, you need to download a
         profile and feed it to an OpenVPN client on your mobile or
         desktop machine.  OpenVPN Clients are available for most
         platforms.  See
@@ -64,9 +63,9 @@
     </p>
 
     <p>
-      {% blocktrans trimmed %}
-        Profile is specific to each user of {{ cfg.box_name }}.  Keep
-        it a secret.
+      {% blocktrans trimmed with box_name=cfg.box_name %}
+        Profile is specific to each user of {{ box_name }}.  Keep it a
+        secret.
       {% endblocktrans %}
     </p>
 
@@ -83,10 +82,10 @@
 
   {% if not status.is_setup and not status.setup_running %}
     <p>
-      {% blocktrans trimmed %}
+      {% blocktrans trimmed with box_name=cfg.box_name %}
         OpenVPN has not yet been setup.  Performing a secure setup
         takes a very long time.  Depending on how fast your
-        {{ cfg.box_name }} is, it may even take hours.  If the setup
+        {{ box_name }} is, it may even take hours.  If the setup
         is interrupted, you may start it again.
       {% endblocktrans %}
     </p>
@@ -106,11 +105,11 @@
     </p>
 
     <p>
-      {% blocktrans trimmed %}
+      {% blocktrans trimmed with box_name=cfg.box_name %}
         To perform a secure setup, this process takes a very long
-        time.  Depending on how fast your {{ cfg.box_name }} is, it
-        may even take hours.  If the setup is interrupted, you may
-        start it again.
+        time.  Depending on how fast your {{ box_name }} is, it may
+        even take hours.  If the setup is interrupted, you may start
+        it again.
       {% endblocktrans %}
     </p>
   {% endif %}
diff --git a/plinth/modules/pagekite/templates/pagekite_custom_services.html b/plinth/modules/pagekite/templates/pagekite_custom_services.html
index cb871717b..c2b0c7d40 100644
--- a/plinth/modules/pagekite/templates/pagekite_custom_services.html
+++ b/plinth/modules/pagekite/templates/pagekite_custom_services.html
@@ -86,8 +86,8 @@
                   {{ service_url }}
                 {% endif %}
                 <br>
-                {% blocktrans trimmed %}
-                  connected to {{ service.backend_host }}:{{ service.backend_port }}
+                {% blocktrans trimmed with backend_host=service.backend_host backend_port=service.backend_port %}
+                  connected to {{ backend_host }}:{{ backend_port }}
                 {% endblocktrans %}
               </span>
             </span>
diff --git a/plinth/modules/pagekite/templates/pagekite_introduction.html b/plinth/modules/pagekite/templates/pagekite_introduction.html
index 57453870d..73f711b36 100644
--- a/plinth/modules/pagekite/templates/pagekite_introduction.html
+++ b/plinth/modules/pagekite/templates/pagekite_introduction.html
@@ -23,26 +23,26 @@
 {% block content %}
 
   <p>
-    {% blocktrans trimmed %}
-      PageKite is a system for exposing {{ cfg.box_name }} services
-      when you don't have a direct connection to the Internet. You
-      only need this if your {{ cfg.box_name }} services are
-      unreachable from the rest of the Internet. This includes the
-      following situations:
+    {% blocktrans trimmed with box_name=cfg.box_name %}
+      PageKite is a system for exposing {{ box_name }} services when
+      you don't have a direct connection to the Internet. You only
+      need this if your {{ box_name }} services are unreachable from
+      the rest of the Internet. This includes the following
+      situations:
     {% endblocktrans %}
   </p>
 
   <ul>
     <li>
-      {% blocktrans trimmed %}
-        {{ cfg.box_name }} is behind a restricted firewall.
+      {% blocktrans trimmed with box_name=cfg.box_name %}
+        {{ box_name }} is behind a restricted firewall.
       {% endblocktrans %}
     </li>
 
     <li>
-      {% blocktrans trimmed %}
-        {{ cfg.box_name }} is connected to a (wireless) router which
-        you don't control.
+      {% blocktrans trimmed with box_name=cfg.box_name %}
+        {{ box_name }} is connected to a (wireless) router which you
+        don't control.
       {% endblocktrans %}
     </li>
 
@@ -64,13 +64,12 @@
   </ul>
 
   <p>
-    {% blocktrans trimmed %}
+    {% blocktrans trimmed with box_name=cfg.box_name %}
       PageKite works around NAT, firewalls and IP-address limitations
       by using a combination of tunnels and reverse proxies. You can
       use any pagekite service provider, for example
       <a href="https://pagekite.net">pagekite.net</a>.  In future it
-      might be possible to use your buddy's {{ cfg.box_name }} for
-      this.
+      might be possible to use your buddy's {{ box_name }} for this.
     {% endblocktrans %}
   </p>
 
diff --git a/plinth/modules/privoxy/templates/privoxy.html b/plinth/modules/privoxy/templates/privoxy.html
index eda395d56..75e7ab787 100644
--- a/plinth/modules/privoxy/templates/privoxy.html
+++ b/plinth/modules/privoxy/templates/privoxy.html
@@ -35,9 +35,9 @@
   </p>
 
   <p>
-    {% blocktrans trimmed %}
+    {% blocktrans trimmed with box_name=cfg.box_name %}
       You can use Privoxy by modifying your browser proxy settings to
-      your {{ cfg.box_name }} hostname (or IP address) with port 8118.
+      your {{ box_name }} hostname (or IP address) with port 8118.
       While using Privoxy, you can see its configuration details and
       documentation at
       <a href="http://config.privoxy.org">http://config.privoxy.org/</a>
diff --git a/plinth/modules/system/templates/system.html b/plinth/modules/system/templates/system.html
index 2d1007c1a..e3cc68759 100644
--- a/plinth/modules/system/templates/system.html
+++ b/plinth/modules/system/templates/system.html
@@ -25,16 +25,16 @@
   <h2>{% trans "System Configuration" %}</h2>
 
   <p>
-    {% blocktrans trimmed %}
+    {% blocktrans trimmed with box_name=cfg.box_name %}
       Here you can administrate the underlying system of your
-      {{ cfg.box_name }}.
+      {{ box_name }}.
     {% endblocktrans %}
   </p>
 
   <p>
-    {% blocktrans trimmed %}
-      The options affect the {{ cfg.box_name }} at its most general
-      level, so be careful!
+    {% blocktrans trimmed with box_name=cfg.box_name %}
+      The options affect the {{ box_name }} at its most general level,
+      so be careful!
     {% endblocktrans %}
   </p>
 
diff --git a/plinth/modules/tor/templates/tor.html b/plinth/modules/tor/templates/tor.html
index ddfb9f538..a48d42011 100644
--- a/plinth/modules/tor/templates/tor.html
+++ b/plinth/modules/tor/templates/tor.html
@@ -85,12 +85,11 @@
   <h3>{% trans "Bridge" %}</h3>
 
   <p>
-    {% blocktrans trimmed %}
-      Your {{ cfg.box_name }} is configured as a Tor bridge with
-      obfsproxy, so it can help circumvent censorship. If your {{
-      cfg.box_name }} is behind a router or firewall, you should make
-      sure the following ports are open, and port-forwarded, if
-      necessary:
+    {% blocktrans trimmed with box_name=cfg.box_name %}
+      Your {{ box_name }} is configured as a Tor bridge with obfsproxy,
+      so it can help circumvent censorship. If your {{ box_name }} is
+      behind a router or firewall, you should make sure the following
+      ports are open, and port-forwarded, if necessary:
     {% endblocktrans %}
   </p>
 
@@ -118,8 +117,8 @@
   <h3>{% trans "SOCKS" %}</h3>
 
   <p>
-    {% blocktrans trimmed %}
-      A Tor SOCKS port is available on your {{ cfg.box_name }} on TCP port
+    {% blocktrans trimmed with box_name=cfg.box_name %}
+      A Tor SOCKS port is available on your {{ box_name }} on TCP port
       9050.
     {% endblocktrans %}
   </p>
diff --git a/plinth/modules/users/templates/users_change_password.html b/plinth/modules/users/templates/users_change_password.html
index 348039c75..4a64f5c28 100644
--- a/plinth/modules/users/templates/users_change_password.html
+++ b/plinth/modules/users/templates/users_change_password.html
@@ -24,8 +24,8 @@
 {% block content %}
 
   <h3>
-    {% blocktrans trimmed %}
-      Change Password for <em>{{ form.user.username }}</em>
+    {% blocktrans trimmed with username=form.user.username %}
+      Change Password for <em>{{ username }}</em>
     {% endblocktrans %}
   </h3>
 
diff --git a/plinth/modules/users/templates/users_delete.html b/plinth/modules/users/templates/users_delete.html
index ea01397a6..f5990eb4f 100644
--- a/plinth/modules/users/templates/users_delete.html
+++ b/plinth/modules/users/templates/users_delete.html
@@ -24,8 +24,8 @@
 {% block content %}
 
   <h3>
-    {% blocktrans trimmed %}
-      Delete User <em>{{ object.username }}</em>
+    {% blocktrans trimmed with username=object.username %}
+      Delete User <em>{{ username }}</em>
     {% endblocktrans %}
   </h3>
 
@@ -35,7 +35,7 @@
     {% csrf_token %}
 
     <input type="submit" class="btn btn-md btn-primary"
-           value="{% blocktrans %}Delete {{ object.username }}{% endblocktrans %}"/>
+           value="{% blocktrans with username=object.username %}Delete {{ username }}{% endblocktrans %}"/>
 
     <a href="{% url 'users:index' %}" role="button"
        class="btn btn-md btn-primary">{% trans "Cancel" %}</a>
diff --git a/plinth/modules/users/templates/users_list.html b/plinth/modules/users/templates/users_list.html
index 308c2fcb1..64701b273 100644
--- a/plinth/modules/users/templates/users_list.html
+++ b/plinth/modules/users/templates/users_list.html
@@ -43,14 +43,14 @@
             <a href="{% url 'users:delete' user.username %}"
                class="btn btn-default btn-sm pull-right"
                role="button"
-               title="{% blocktrans %}Delete user {{ user.username }}{% endblocktrans %}">
+               title="{% blocktrans with username=user.username %}Delete user {{ username }}{% endblocktrans %}">
               <span class="glyphicon glyphicon-trash"
                     aria-hidden="true"></span>
             </a>
 
             <a class='user-edit-label'
                href="{% url 'users:edit' user.username %}"
-               title="{% blocktrans %}Edit user {{ user.username }}{% endblocktrans %}">
+               title="{% blocktrans with username=user.username %}Edit user {{ username }}{% endblocktrans %}">
               {{ user.username }}
             </a>
 
diff --git a/plinth/modules/users/templates/users_update.html b/plinth/modules/users/templates/users_update.html
index 6dff9641e..7867949ac 100644
--- a/plinth/modules/users/templates/users_update.html
+++ b/plinth/modules/users/templates/users_update.html
@@ -32,8 +32,8 @@
 {% block content %}
 
   <h3>
-    {% blocktrans trimmed %}
-      Edit User <em>{{ object.username }}</em>
+    {% blocktrans trimmed with username=object.username %}
+      Edit User <em>{{ username }}</em>
     {% endblocktrans %}
   </h3>
 
diff --git a/plinth/templates/package_install.html b/plinth/templates/package_install.html
index a78a3cd78..7df7bb8c6 100644
--- a/plinth/templates/package_install.html
+++ b/plinth/templates/package_install.html
@@ -71,9 +71,8 @@
 
     {% for key, transaction in transactions.items %}
       <div>
-        {% blocktrans trimmed %}
-          Installing {{ transaction.package_names|join:", " }}:
-          {{ transaction.status_string }}
+        {% blocktrans trimmed with package_names=transaction.package_names|join:", " status=transaction.status_string %}
+          Installing {{ package_names }}: {{ status }}
         {% endblocktrans %}
       </div>
       <div class="progress">
@@ -82,8 +81,8 @@
              aria-valuenow="{{ transaction.percentage }}"
              style="width: {{ transaction.percentage }}%">
           <span class="sr-only">
-            {% blocktrans trimmed %}
-              {{ transaction.percentage }}% complete
+            {% blocktrans trimmed with percentage=transaction.percentage %}
+              {{ percentage }}% complete
             {% endblocktrans %}
           </span>
         </div>