Update strings during edit/delete operations

plinth/modules/networks/templates/connections_delete.html

@@ -23,9 +23,13 @@
 
 {% block content %}
 
-  <h3>{% blocktrans %}Delete Connection <em>{{ name }}</em>{% endblocktrans %}</h3>
+  <h3>{% trans "Delete Connection" %}</h3>
 
-  <p>{% trans "Delete connection permanently?" %}</p>
+  <p>
+    {% blocktrans trimmed %}
+      Delete connection <strong>{{ name }}</strong> permanently?
+    {% endblocktrans %}
+  </p>
 
   <form class="form" method="post">
     {% csrf_token %}

plinth/modules/users/templates/users_delete.html

@@ -23,13 +23,13 @@
 
 {% block content %}
 
-  <h3>
+  <h3>{% trans "Delete User" %}</h3>
-    {% blocktrans trimmed with username=object.username %}
-      Delete User <em>{{ username }}</em>
-    {% endblocktrans %}
-  </h3>
 
-  <p>{% trans "Delete user permanently?" %}</p>
+  <p>
+    {% blocktrans trimmed with username=object.username %}
+      Delete user <strong>{{ username }}</strong> permanently?
+    {% endblocktrans %}
+  </p>
 
   <form class="form" method="post">
     {% csrf_token %}

plinth/modules/users/templates/users_update.html

@@ -31,11 +31,7 @@
 
 {% block content %}
 
-  <h3>
+  <h3>{{ object.username }}</h3>
-    {% blocktrans trimmed with username=object.username %}
-      Edit User <em>{{ username }}</em>
-    {% endblocktrans %}
-  </h3>
 
   <p>
     {% url 'users:change_password' object.username as change_password_url %}