diff --git a/evap/contributor/templates/contributor_evaluation_form.html b/evap/contributor/templates/contributor_evaluation_form.html
index a96b3418e4..18c0dbc0c4 100644
--- a/evap/contributor/templates/contributor_evaluation_form.html
+++ b/evap/contributor/templates/contributor_evaluation_form.html
@@ -18,9 +18,9 @@
 
     <div class="callout callout-info small">
         {% if editable %}
-            {% blocktranslate %}Please review the evaluation's details below, add all contributors and select suitable questionnaires. Once everything is okay, please approve the evaluation on the bottom of the page.{% endblocktrans %}
+            {% blocktranslate %}Please review the evaluation's details below, add all contributors and select suitable questionnaires. Once everything is okay, please approve the evaluation on the bottom of the page.{% endblocktranslate %}
         {% else %}
-            {% blocktranslate %}You cannot edit this evaluation because it has already been approved.{% endblocktrans %}
+            {% blocktranslate %}You cannot edit this evaluation because it has already been approved.{% endblocktranslate %}
         {% endif %}
     </div>
     <h3>
@@ -99,7 +99,7 @@ <h5 class="card-title me-auto">{% translate 'Evaluation data' %}</h5>
                         <span slot="question">
                             {% blocktranslate trimmed %}
                                 Do you want to approve this evaluation? This will allow the evaluation team to proceed with the preparation, but you won't be able to make any further changes.
-                            {% endblocktrans %}
+                            {% endblocktranslate %}
                         </span>
 
                         <button slot="show-button" type="button" class="btn btn-success">{% translate 'Save and approve' %}</button>
@@ -133,11 +133,11 @@ <h5 class="modal-title" id="previewModalLabel">{% translate 'Preview' %}</h5>
 {% block modals %}
     {{ block.super }}
 
-    {% blocktranslate asvar title with evaluation_name=evaluation.full_name %}Request account creation for {{ evaluation_name }}{% endblocktrans %}
+    {% blocktranslate asvar title with evaluation_name=evaluation.full_name %}Request account creation for {{ evaluation_name }}{% endblocktranslate %}
     {% translate 'Please tell us which new account we should create. We need the name and email for all new accounts.' as teaser %}
     {% include 'contact_modal.html' with modal_id='createAccountRequestModal' user=request.user title=title teaser=teaser %}
 
-    {% blocktranslate asvar title with evaluation_name=evaluation.full_name %}Request evaluation changes for {{ evaluation_name }}{% endblocktrans %}
+    {% blocktranslate asvar title with evaluation_name=evaluation.full_name %}Request evaluation changes for {{ evaluation_name }}{% endblocktranslate %}
     {% translate 'Please tell us what changes to the evaluation we should make.' as teaser %}
     {% include 'contact_modal.html' with modal_id='changeEvaluationRequestModal' user=request.user title=title teaser=teaser %}
 {% endblock %}
diff --git a/evap/evaluation/templates/contribution_formset.html b/evap/evaluation/templates/contribution_formset.html
index 84d974980d..25324de6de 100644
--- a/evap/evaluation/templates/contribution_formset.html
+++ b/evap/evaluation/templates/contribution_formset.html
@@ -38,7 +38,7 @@ <h5 class="card-title me-auto">{% translate 'Contributors' %}</h5>
                         {% endfor %}
                         {% include 'bootstrap_form_errors.html' with errors=form.contributor.errors %}
                         {{ form.contributor }}
-                        <div class="form-check mt-2" data-bs-toggle="tooltip" data-bs-placement="right" title="{% blocktranslate %}Select this option if no questions about this person shall be included in the evaluation. This can be used if the person does not visibly contribute and is solely added to receive permissions for editing the evaluation or viewing text answers.{% endblocktrans %}">
+                        <div class="form-check mt-2" data-bs-toggle="tooltip" data-bs-placement="right" title="{% blocktranslate %}Select this option if no questions about this person shall be included in the evaluation. This can be used if the person does not visibly contribute and is solely added to receive permissions for editing the evaluation or viewing text answers.{% endblocktranslate %}">
                             <input class="form-check-input" id="{{ form.does_not_contribute.id_for_label }}" name="{{ form.does_not_contribute.html_name }}"
                                 type="checkbox"{% if form.does_not_contribute.value %} checked{% endif %}
                                 {% if form.does_not_contribute.field.disabled %} disabled{% endif %} />
@@ -58,7 +58,7 @@ <h5 class="card-title me-auto">{% translate 'Contributors' %}</h5>
                         <br /><br />
                         <span class="{% if form.label.errors %}error-label{% endif %}">{% translate 'Label' %}:
                             <span data-bs-toggle="tooltip" data-bs-placement="right" class="fas fa-circle-info"
-                                title="{% blocktranslate %}This text will be shown next to the contributor's name in the questionnaire.{% endblocktrans %}">
+                                title="{% blocktranslate %}This text will be shown next to the contributor's name in the questionnaire.{% endblocktranslate %}">
                             </span>
                         </span>
                         <br />
diff --git a/evap/evaluation/templates/external_user_confirm_login.html b/evap/evaluation/templates/external_user_confirm_login.html
index 44a13860ac..86bb5f1b54 100644
--- a/evap/evaluation/templates/external_user_confirm_login.html
+++ b/evap/evaluation/templates/external_user_confirm_login.html
@@ -18,7 +18,7 @@ <h4 class="card-title text-primary">
                 <form class="d-flex flex-column" role="form" method="POST">
                     {% csrf_token %}
                     <div class="d-flex justify-content-center">
-                        <button type="submit" class="btn btn-primary login-button">{% blocktranslate %}Login as {{ username }}{% endblocktrans %}</button>
+                        <button type="submit" class="btn btn-primary login-button">{% blocktranslate %}Login as {{ username }}{% endblocktranslate %}</button>
                     </div>
                 </form>
             </div>
diff --git a/evap/evaluation/templates/log/changed_fields_entry.html b/evap/evaluation/templates/log/changed_fields_entry.html
index 2f9180e013..74d5f6490f 100644
--- a/evap/evaluation/templates/log/changed_fields_entry.html
+++ b/evap/evaluation/templates/log/changed_fields_entry.html
@@ -16,7 +16,7 @@
                 {% elif action.type == "clear" %}
                     {{ action.label }} {% translate "cleared" %}
                 {% elif action.type == "delete" %}
-                    {% blocktranslate with label=action.label count count=action.items|length %}{{ label }} was{% plural %}{{ label }} were{% endblocktrans %}:
+                    {% blocktranslate with label=action.label count count=action.items|length %}{{ label }} was{% plural %}{{ label }} were{% endblocktranslate %}:
                     {{ action.items|join:", " }}
                 {% elif action.type == "change" %}
                     {{ action.label }}: {{ action.items.0 }} &#8594; {{ action.items.1 }}
diff --git a/evap/evaluation/templates/notebook.html b/evap/evaluation/templates/notebook.html
index 4a4e18b4d8..274d06e1ab 100644
--- a/evap/evaluation/templates/notebook.html
+++ b/evap/evaluation/templates/notebook.html
@@ -20,7 +20,7 @@ <h5 class="card-title m-0">
                             <span class="visible-if-successful">{% translate 'Saved successfully' %}</span>
                         </button>
                         <div class="align-self-center right-to-element">
-                            <span class="ms-2 fas fa-circle-info" data-bs-toggle="tooltip" data-bs-placement="right" title="{% blocktranslate %}Here you can store private notes that you want to keep ready for future evaluations. The notes will be stored in plain text in your account on the EvaP server, but will not be shown to anyone but you.{% endblocktrans %}"></span>
+                            <span class="ms-2 fas fa-circle-info" data-bs-toggle="tooltip" data-bs-placement="right" title="{% blocktranslate %}Here you can store private notes that you want to keep ready for future evaluations. The notes will be stored in plain text in your account on the EvaP server, but will not be shown to anyone but you.{% endblocktranslate %}"></span>
                         </div>
                     </div>
                 </div>
diff --git a/evap/evaluation/templates/profile.html b/evap/evaluation/templates/profile.html
index a6f5a9b3b7..36841bcf66 100644
--- a/evap/evaluation/templates/profile.html
+++ b/evap/evaluation/templates/profile.html
@@ -55,7 +55,7 @@ <h4 class="card-title mb-4">{% translate 'Delegates and emails' %}</h4>
                                 </tr>
                                 <tr>
                                     <td>
-                                        <strong>{% blocktranslate %}You receive CC'ed emails for{% endblocktrans %}</strong><br />
+                                        <strong>{% blocktranslate %}You receive CC'ed emails for{% endblocktranslate %}</strong><br />
                                         {% for ccing_user in ccing_users %}
                                             {{ ccing_user.full_name }}{% if not forloop.last %}, {% endif %}
                                         {% empty %}
diff --git a/evap/evaluation/templates/textanswer_visibility_info.html b/evap/evaluation/templates/textanswer_visibility_info.html
index e1ab6ce278..cb82cd6f39 100644
--- a/evap/evaluation/templates/textanswer_visibility_info.html
+++ b/evap/evaluation/templates/textanswer_visibility_info.html
@@ -1,10 +1,10 @@
 <span class="far fa-eye ms-1 icon-gray" data-bs-toggle="tooltip" data-bs-placement="left" title="
     {{ intro_text }}<br />
     {% for contributor in visible_by_contribution %}
-        {{ contributor.full_name }}{% if contributor.is_proxy_user %} ({% blocktranslate count delegate_count=contributor.delegates.count %}{{ delegate_count }} person{% plural %}{{ delegate_count }} people{% endblocktrans %}){% endif %}{% if not forloop.last or visible_by_delegation_count > 0 %}, {% endif %}
+        {{ contributor.full_name }}{% if contributor.is_proxy_user %} ({% blocktranslate count delegate_count=contributor.delegates.count %}{{ delegate_count }} person{% plural %}{{ delegate_count }} people{% endblocktranslate %}){% endif %}{% if not forloop.last or visible_by_delegation_count > 0 %}, {% endif %}
     {% endfor %}
     {% if visible_by_delegation_count > 0 %}
-        {% blocktranslate count delegate_count=visible_by_delegation_count %}{{ delegate_count }} delegate{% plural %}{{ delegate_count }} delegates{% endblocktrans %}
+        {% blocktranslate count delegate_count=visible_by_delegation_count %}{{ delegate_count }} delegate{% plural %}{{ delegate_count }} delegates{% endblocktranslate %}
     {% endif %}
     {% translate 'and the evaluation team.' %}
 "></span>
diff --git a/evap/grades/templates/grades_course_view.html b/evap/grades/templates/grades_course_view.html
index f6dd63d3f4..2d3414019d 100644
--- a/evap/grades/templates/grades_course_view.html
+++ b/evap/grades/templates/grades_course_view.html
@@ -40,7 +40,7 @@ <h3 class="mb-3">{{ course.name }} ({{ semester.name }})</h3>
                                             <span slot="question">
                                                 {% blocktranslate trimmed with description=grade_document.description %}
                                                     Do you really want to delete the grade document <strong>{{ description }}</strong>?
-                                                {% endblocktrans %}
+                                                {% endblocktranslate %}
                                             </span>
 
                                             <button slot="show-button" type="button" class="btn btn-sm btn-danger" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Delete' %}">
diff --git a/evap/grades/templates/grades_semester_view.html b/evap/grades/templates/grades_semester_view.html
index 42eab0583f..d4d6b6d8b3 100644
--- a/evap/grades/templates/grades_semester_view.html
+++ b/evap/grades/templates/grades_semester_view.html
@@ -74,7 +74,7 @@ <h3 class="col-8 mb-0">
                                                 <span slot="question">
                                                     {% blocktranslate trimmed with course_name=course.name %}
                                                         Please confirm that a grade document for the course <strong>{{ course_name }}</strong> will be uploaded later on.
-                                                    {% endblocktrans %}
+                                                    {% endblocktranslate %}
                                                 </span>
 
                                                 <a slot="show-button" href="#">
@@ -97,7 +97,7 @@ <h3 class="col-8 mb-0">
                                                     <span slot="question">
                                                         {% blocktranslate trimmed with course_name=course.name %}
                                                             Please confirm that the final grades for the course <strong>{{ course_name }}</strong> have been submitted but will not be uploaded.
-                                                        {% endblocktrans %}
+                                                        {% endblocktranslate %}
                                                     </span>
 
                                                     <button slot="show-button" type="button" {{ disable_if_archived }} class="btn btn-sm btn-secondary" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Confirm that final grades have been submitted but will not be uploaded.' %}">
diff --git a/evap/grades/templates/grades_upload_form.html b/evap/grades/templates/grades_upload_form.html
index f0bf0960da..cbc7508f23 100644
--- a/evap/grades/templates/grades_upload_form.html
+++ b/evap/grades/templates/grades_upload_form.html
@@ -11,15 +11,15 @@
     {% if show_automated_publishing_info %}
         <div class="callout callout-info">
             <b>{% translate 'Automated publishing' %}</b><br />
-            {% blocktranslate %}After this file with final grades was uploaded, the evaluation results will be published automatically once the evaluation ends. If the evaluation has already ended, it will be published immediately. All contributors and participants will receive an email informing them about the published evaluation results and the available grade file document.{% endblocktrans %}
+            {% blocktranslate %}After this file with final grades was uploaded, the evaluation results will be published automatically once the evaluation ends. If the evaluation has already ended, it will be published immediately. All contributors and participants will receive an email informing them about the published evaluation results and the available grade file document.{% endblocktranslate %}
         </div>
     {% endif %}
 
     <h3 class="mb-3">
         {% if final_grades %}
-            {% blocktranslate with course=course.name semester=semester.name %}Upload final grades for {{ course }} ({{ semester }}){% endblocktrans %}
+            {% blocktranslate with course=course.name semester=semester.name %}Upload final grades for {{ course }} ({{ semester }}){% endblocktranslate %}
         {% else %}
-            {% blocktranslate with course=course.name semester=semester.name %}Upload midterm grades for {{ course }} ({{ semester }}){% endblocktrans %}
+            {% blocktranslate with course=course.name semester=semester.name %}Upload midterm grades for {{ course }} ({{ semester }}){% endblocktranslate %}
         {% endif %}
     </h3>
     <form method="POST" class="form-horizontal" id="grades-upload-form" enctype="multipart/form-data">
diff --git a/evap/results/templates/result_widget_tooltip.html b/evap/results/templates/result_widget_tooltip.html
index 9b8f9e3d32..a67be9ddc5 100644
--- a/evap/results/templates/result_widget_tooltip.html
+++ b/evap/results/templates/result_widget_tooltip.html
@@ -2,7 +2,7 @@
 
 {% if weight_info %}
     <p>
-        {% blocktranslate with percentage=weight_info %}This evaluation contributes {{ percentage }} to the final grade of the course.{% endblocktrans %}
+        {% blocktranslate with percentage=weight_info %}This evaluation contributes {{ percentage }} to the final grade of the course.{% endblocktranslate %}
     </p>
 {% endif %}
 {% if question_result %}
diff --git a/evap/results/templates/results_evaluation_detail.html b/evap/results/templates/results_evaluation_detail.html
index 48c41bc8ac..f587acbcd1 100644
--- a/evap/results/templates/results_evaluation_detail.html
+++ b/evap/results/templates/results_evaluation_detail.html
@@ -44,7 +44,7 @@ <h3 class="mb-0">{{ evaluation.full_name }} ({{ evaluation.course.semester.name
                                 class="btn btn-sm btn-light{% if view == 'export' %} active{% endif %}"
                                 data-bs-toggle="tooltip"
                                 data-bs-placement="bottom"
-                                title="{% blocktranslate %}Shows filtered view meant for personal export. Other contributors' results and private answers are hidden.{% endblocktrans %}"
+                                title="{% blocktranslate %}Shows filtered view meant for personal export. Other contributors' results and private answers are hidden.{% endblocktranslate %}"
                             >
                                 {% translate 'Export' context 'view mode' %}
                             </a>
@@ -67,7 +67,7 @@ <h3 class="mb-0">{{ evaluation.full_name }} ({{ evaluation.course.semester.name
                                 class="btn btn-sm btn-light"
                                 data-bs-toggle="tooltip"
                                 data-bs-placement="bottom"
-                                title="{% blocktranslate %}The results of this evaluation have not been published because it didn't get enough votes.{% endblocktrans %}"
+                                title="{% blocktranslate %}The results of this evaluation have not been published because it didn't get enough votes.{% endblocktranslate %}"
                             >
                                 {% if evaluation.course.is_private %}
                                     {% translate 'Participant' %}
diff --git a/evap/results/templates/textanswer_list.html b/evap/results/templates/textanswer_list.html
index f18be4e137..b14e300f66 100644
--- a/evap/results/templates/textanswer_list.html
+++ b/evap/results/templates/textanswer_list.html
@@ -3,7 +3,7 @@
 <div class="w-100">
     <div class="float-end text-end">
         <span class="d-print-none">
-            {% blocktranslate asvar intro_text %}These text answers can be seen by:{% endblocktrans %}
+            {% blocktranslate asvar intro_text %}These text answers can be seen by:{% endblocktranslate %}
             {% include 'textanswer_visibility_info.html' with intro_text=intro_text visible_by_contribution=question_result.answers_visible_to.visible_by_contribution visible_by_delegation_count=question_result.answers_visible_to.visible_by_delegation_count %}
         </span>
         <div class="d-inline-block badge-participants badge-participants-{{ num_answers|participationclass:num_voters }} ms-2">
diff --git a/evap/rewards/templates/rewards_index.html b/evap/rewards/templates/rewards_index.html
index d0b427b544..13e23ab5ff 100644
--- a/evap/rewards/templates/rewards_index.html
+++ b/evap/rewards/templates/rewards_index.html
@@ -8,7 +8,7 @@
     {{ block.super }}
 
     <div class="callout callout-info small">
-        {% blocktranslate %}You will get reward points by taking part in evaluations. These points can be redeemed for different events. You will receive vouchers for food and drinks at the event you selected below. We'll inform you about any upcoming event where you can redeem your reward points.{% endblocktrans %}
+        {% blocktranslate %}You will get reward points by taking part in evaluations. These points can be redeemed for different events. You will receive vouchers for food and drinks at the event you selected below. We'll inform you about any upcoming event where you can redeem your reward points.{% endblocktranslate %}
     </div>
 
     <div class="card card-outline-primary mb-3">
@@ -50,10 +50,10 @@
                         </span>
                     </form>
                 {% else %}
-                    <p class="fst-italic">{% blocktranslate %}Currently there are no events available for which you can redeem points. We'll send you a message when this changes.{% endblocktrans %}</p>
+                    <p class="fst-italic">{% blocktranslate %}Currently there are no events available for which you can redeem points. We'll send you a message when this changes.{% endblocktranslate %}</p>
                 {% endif %}
             {% else %}
-                <p class="fst-italic">{% blocktranslate %}You don't have any reward points that you could redeem.{% endblocktrans %}</p>
+                <p class="fst-italic">{% blocktranslate %}You don't have any reward points that you could redeem.{% endblocktranslate %}</p>
             {% endif %}
         </div>
     </div>
diff --git a/evap/rewards/templates/rewards_reward_point_redemption_event_list.html b/evap/rewards/templates/rewards_reward_point_redemption_event_list.html
index 9d149cceca..26e2b2bc32 100644
--- a/evap/rewards/templates/rewards_reward_point_redemption_event_list.html
+++ b/evap/rewards/templates/rewards_reward_point_redemption_event_list.html
@@ -30,7 +30,7 @@
                                     <span slot="question">
                                         {% blocktranslate trimmed with event_name=event.name %}
                                             Do you really want to delete the event <strong>{{ event_name }}</strong>?
-                                        {% endblocktrans %}
+                                        {% endblocktranslate %}
                                     </span>
 
                                     <button slot="show-button" type="button" class="btn btn-sm btn-danger" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Delete' %}">
diff --git a/evap/staff/templates/staff_course_type_merge.html b/evap/staff/templates/staff_course_type_merge.html
index e47e808d73..bc32502cd8 100644
--- a/evap/staff/templates/staff_course_type_merge.html
+++ b/evap/staff/templates/staff_course_type_merge.html
@@ -17,7 +17,7 @@ <h3>{% translate 'Merge course types' %}</h3>
             <p>
                 {% blocktranslate %}The following courses currently have the course type <strong>{{ other_type }}</strong> and will
                 get the type <strong>{{ main_type }}</strong> once you merge the course types. The course type <strong>
-                {{ other_type }}</strong> will be deleted after that.{% endblocktrans %}
+                {{ other_type }}</strong> will be deleted after that.{% endblocktranslate %}
             </p>
 
             <ul>
diff --git a/evap/staff/templates/staff_evaluation_email.html b/evap/staff/templates/staff_evaluation_email.html
index f0e8d5956a..f6ff4c5211 100644
--- a/evap/staff/templates/staff_evaluation_email.html
+++ b/evap/staff/templates/staff_evaluation_email.html
@@ -5,7 +5,7 @@
 {% block content %}
     {{ block.super }}
     {% if form.errors %}
-        <div class="alert alert-danger" role="alert">{% blocktranslate %}Please fill out all required fields and select at least one recipient group.{% endblocktrans %}</div>
+        <div class="alert alert-danger" role="alert">{% blocktranslate %}Please fill out all required fields and select at least one recipient group.{% endblocktranslate %}</div>
     {% endif %}
     <form id="evaluation-email-form" method="POST" class="form-horizontal">
         {% csrf_token %}
diff --git a/evap/staff/templates/staff_evaluation_evaluation_period.html b/evap/staff/templates/staff_evaluation_evaluation_period.html
index a9b8678873..0c88d81eb5 100644
--- a/evap/staff/templates/staff_evaluation_evaluation_period.html
+++ b/evap/staff/templates/staff_evaluation_evaluation_period.html
@@ -5,7 +5,7 @@
 {% else %}
     <span class="small">
         {{ evaluation.vote_start_datetime }}{% if not start_only %} &ndash;<br />
-        {{ evaluation.vote_end_date }} ({% blocktranslate count runtime=evaluation.runtime %}{{ runtime }} day{% plural %}{{ runtime }} days{% endblocktrans %}){% endif %}
+        {{ evaluation.vote_end_date }} ({% blocktranslate count runtime=evaluation.runtime %}{{ runtime }} day{% plural %}{{ runtime }} days{% endblocktranslate %}){% endif %}
     </span><br />
     {% if not start_only %}
         {% if state < evaluation.State.IN_EVALUATION  %}
diff --git a/evap/staff/templates/staff_evaluation_person_management.html b/evap/staff/templates/staff_evaluation_person_management.html
index d9799e5009..a85fab92ee 100644
--- a/evap/staff/templates/staff_evaluation_person_management.html
+++ b/evap/staff/templates/staff_evaluation_person_management.html
@@ -34,7 +34,7 @@ <h6 class="card-subtitle mb-2 text-muted">{% translate 'From Excel file' %}</h6>
                                     <span slot="question">
                                         {% blocktranslate trimmed %}
                                             Do you really want to import the Excel file with participant data?
-                                        {% endblocktrans %}
+                                        {% endblocktranslate %}
                                     </span>
 
                                     <button slot="show-button" type="button" class="btn btn-sm btn-primary me-1 form-submit-btn">{% translate 'Import previously uploaded file' %}</button>
@@ -46,7 +46,7 @@ <h6 class="card-subtitle mb-2 text-muted">{% translate 'From Excel file' %}</h6>
                                     <span slot="question">
                                         {% blocktranslate trimmed %}
                                             Do you really want to delete all existing participants and replace them with participant data from the Excel file?
-                                        {% endblocktrans %}
+                                        {% endblocktranslate %}
                                     </span>
 
                                     <button slot="show-button" type="button" class="btn btn-sm btn-danger form-submit-btn">{% translate 'Replace participants' %}</button>
@@ -74,7 +74,7 @@ <h6 class="card-subtitle mb-2 text-muted">{% translate 'From other evaluation' %
                             <span slot="question">
                                 {% blocktranslate trimmed %}
                                     Do you really want to copy the participants?
-                                {% endblocktrans %}
+                                {% endblocktranslate %}
                             </span>
 
                             <button slot="show-button" type="button" class="btn btn-sm btn-primary form-submit-btn">{% translate 'Copy participants' %}</button>
@@ -85,7 +85,7 @@ <h6 class="card-subtitle mb-2 text-muted">{% translate 'From other evaluation' %
                             <span slot="question">
                                 {% blocktranslate trimmed %}
                                     Do you really want to delete all existing participants and copy the participants into the evaluation?
-                                {% endblocktrans %}
+                                {% endblocktranslate %}
                             </span>
 
                             <button slot="show-button" type="button" class="btn btn-sm btn-danger ms-1 form-submit-btn">{% translate 'Replace participants' %}</button>
@@ -124,7 +124,7 @@ <h6 class="card-subtitle mb-2 text-muted">{% translate 'From Excel file' %}</h6>
                                     <span slot="question">
                                         {% blocktranslate trimmed %}
                                             Do you really want to import the Excel file with contributor data?
-                                        {% endblocktrans %}
+                                        {% endblocktranslate %}
                                     </span>
 
                                     <button slot="show-button" type="button" class="btn btn-sm btn-primary form-submit-btn">{% translate 'Import previously uploaded file' %}</button>
@@ -135,7 +135,7 @@ <h6 class="card-subtitle mb-2 text-muted">{% translate 'From Excel file' %}</h6>
                                     <span slot="question">
                                         {% blocktranslate trimmed %}
                                             Do you really want to delete all existing contributors and replace them with contributor data from the Excel file?
-                                        {% endblocktrans %}
+                                        {% endblocktranslate %}
                                     </span>
 
                                     <button slot="show-button" type="button" class="btn btn-sm btn-danger ms-1 form-submit-btn">{% translate 'Replace contributors' %}</button>
@@ -163,7 +163,7 @@ <h6 class="card-subtitle mb-2 text-muted">{% translate 'From other evaluation' %
                             <span slot="question">
                                 {% blocktranslate trimmed %}
                                     Do you really want to copy the contributors?
-                                {% endblocktrans %}
+                                {% endblocktranslate %}
                             </span>
 
                             <button slot="show-button" type="button" class="btn btn-sm btn-primary form-submit-btn">{% translate 'Copy contributors' %}</button>
@@ -174,7 +174,7 @@ <h6 class="card-subtitle mb-2 text-muted">{% translate 'From other evaluation' %
                             <span slot="question">
                                 {% blocktranslate trimmed %}
                                     Do you really want to delete all existing contributors and copy the contributors into the evaluation?
-                                {% endblocktrans %}
+                                {% endblocktranslate %}
                             </span>
 
                             <button slot="show-button" type="button" class="btn btn-sm btn-danger ms-1 form-submit-btn">{% translate 'Replace contributors' %}</button>
diff --git a/evap/staff/templates/staff_evaluation_textanswers.html b/evap/staff/templates/staff_evaluation_textanswers.html
index 985745fa04..1df6cf722c 100644
--- a/evap/staff/templates/staff_evaluation_textanswers.html
+++ b/evap/staff/templates/staff_evaluation_textanswers.html
@@ -59,6 +59,6 @@ <h3 class="mb-0">{{ evaluation.full_name }} ({{ evaluation.course.semester.name
         {% include 'evaluation_badges.html' with mode='manager' %}
     </div>
     <div class="callout callout-warning">
-        {% blocktranslate %}If you select "delete" for a text answer on this page, the respective answer will be deleted irrevocably when publishing the evaluation's results. If you edit an answer, the original answer will also be deleted when publishing the evaluation's results.{% endblocktrans %}
+        {% blocktranslate %}If you select "delete" for a text answer on this page, the respective answer will be deleted irrevocably when publishing the evaluation's results. If you edit an answer, the original answer will also be deleted when publishing the evaluation's results.{% endblocktranslate %}
     </div>
 {% endblock %}
diff --git a/evap/staff/templates/staff_evaluation_textanswers_quick.html b/evap/staff/templates/staff_evaluation_textanswers_quick.html
index 18aff3bdce..b8a9bf1049 100644
--- a/evap/staff/templates/staff_evaluation_textanswers_quick.html
+++ b/evap/staff/templates/staff_evaluation_textanswers_quick.html
@@ -124,7 +124,7 @@ <h5 class="modal-title" id="hotkeys-modal-title">Hotkeys</h5>
                         {% endif %}
                         {% for next_evaluation in next_evaluations %}
                             <span data-next-evaluation-index="{{ forloop.counter0 }}" data-evaluation="{{ next_evaluation.pk }}">
-                                {% blocktranslate with name=next_evaluation.full_name count answers=next_evaluation.num_unreviewed_textanswers %}The next evaluation "{{ name }}" has got {{ answers }} unreviewed text answer.{% plural %}The next evaluation "{{ name }}" has got {{ answers }} unreviewed text answers.{% endblocktrans %}
+                                {% blocktranslate with name=next_evaluation.full_name count answers=next_evaluation.num_unreviewed_textanswers %}The next evaluation "{{ name }}" has got {{ answers }} unreviewed text answer.{% plural %}The next evaluation "{{ name }}" has got {{ answers }} unreviewed text answers.{% endblocktranslate %}
                             </span>
                         {% endfor %}
                     </div>
@@ -150,7 +150,7 @@ <h5 class="modal-title" id="hotkeys-modal-title">Hotkeys</h5>
                         {% translate 'Publish' %}
                     </button>
                     <button type="submit" name="action" value="make_private" class="btn btn-sm btn-outline-secondary" disabled
-                        title="{% blocktranslate %}This answer is for a general question and can't be made private.{% endblocktrans %}" data-bs-toggle="tooltip">
+                        title="{% blocktranslate %}This answer is for a general question and can't be made private.{% endblocktranslate %}" data-bs-toggle="tooltip">
                         {% translate 'Private' %}
                     </button>
                     <button type="submit" name="action" value="delete" class="btn btn-sm btn-outline-secondary">
diff --git a/evap/staff/templates/staff_questionnaire_index_list.html b/evap/staff/templates/staff_questionnaire_index_list.html
index 2bcfb08e5f..c26da132b2 100644
--- a/evap/staff/templates/staff_questionnaire_index_list.html
+++ b/evap/staff/templates/staff_questionnaire_index_list.html
@@ -28,8 +28,8 @@
                                 <td>
                                     <strong class="questionnaire-name">{{ questionnaire.name }}</strong>
                                     <br />
-                                    {% blocktranslate count questionnaire.questions.count as count %}{{ count }} question{% plural %}{{ count }} questions{% endblocktrans %},
-                                    {% blocktranslate count questionnaire.contributions.count as count %}used {{ count }} time{% plural %}used {{ count }} times{% endblocktrans %}
+                                    {% blocktranslate count questionnaire.questions.count as count %}{{ count }} question{% plural %}{{ count }} questions{% endblocktranslate %},
+                                    {% blocktranslate count questionnaire.contributions.count as count %}used {{ count }} time{% plural %}used {{ count }} times{% endblocktranslate %}
                                 </td>
                                 <td>
                                     {% if type != 'contributor' %}
@@ -41,7 +41,7 @@
                                 </td>
                                 <td>
                                     <div class="btn-group icon-buttons">
-                                        <button data-visibility="0" type="button" onclick="changeVisibility(this);" class="btn btn-sm btn-light{% if questionnaire.visibility == 0 %} active{% endif %}" data-bs-toggle="tooltip" data-bs-placement="top" title="{% blocktranslate %}Hide in lists{% endblocktrans %}"><span class="fas fa-fw fa-eye-slash" aria-hidden="true"></span></button>
+                                        <button data-visibility="0" type="button" onclick="changeVisibility(this);" class="btn btn-sm btn-light{% if questionnaire.visibility == 0 %} active{% endif %}" data-bs-toggle="tooltip" data-bs-placement="top" title="{% blocktranslate %}Hide in lists{% endblocktranslate %}"><span class="fas fa-fw fa-eye-slash" aria-hidden="true"></span></button>
                                         <button data-visibility="1" type="button" onclick="changeVisibility(this);" class="btn btn-sm btn-light{% if questionnaire.visibility == 1 %} active{% endif %}" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Show only for managers' %}"><span class="fas fa-fw fa-briefcase" aria-hidden="true"></span></button>
                                         <button data-visibility="2" type="button" onclick="changeVisibility(this);" class="btn btn-sm btn-light{% if questionnaire.visibility == 2 %} active{% endif %}" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Show for managers and editors' %}"><span class="fas fa-fw fa-person-chalkboard" aria-hidden="true"></span></button>
                                     </div>
@@ -58,7 +58,7 @@
                                             <span slot="question">
                                                 {% blocktranslate trimmed with questionnaire_name=questionnaire.name %}
                                                     Do you really want to delete the questionnaire <strong>{{questionnaire_name}}</strong>?
-                                                {% endblocktrans %}
+                                                {% endblocktranslate %}
                                             </span>
 
                                             <button slot="show-button" type="button" class="btn btn-sm btn-danger" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Delete' %}">
diff --git a/evap/staff/templates/staff_semester_view.html b/evap/staff/templates/staff_semester_view.html
index 3bbd8dc068..2336bb2b8f 100644
--- a/evap/staff/templates/staff_semester_view.html
+++ b/evap/staff/templates/staff_semester_view.html
@@ -20,7 +20,7 @@ <h3 class="m-0 me-1">{{ semester.name }}</h3>
                         <span slot="question">
                             {% blocktranslate trimmed %}
                                 Do you want to make this the active semester?
-                            {% endblocktrans %}
+                            {% endblocktranslate %}
                         </span>
 
                         <button
@@ -45,7 +45,7 @@ <h3 class="m-0 me-1">{{ semester.name }}</h3>
                                 Do you really want to delete the semester <strong>{{ semester_name }}</strong>?
                                 All courses and evaluations will be deleted as well as all results.
                                 If you are sure, enter the name of the semester below.
-                            {% endblocktrans %}
+                            {% endblocktranslate %}
                         </span>
 
                         <div slot="extra-inputs">
@@ -103,7 +103,7 @@ <h3 class="m-0 me-1">{{ semester.name }}</h3>
                                     {% blocktranslate trimmed with semester_name=semester.name %}
                                         Do you really want to archive all participations in the semester <strong>{{ semester_name }}</strong>?
                                         Further changes to the evaluations won't be possible and you can't undo this action.
-                                    {% endblocktrans %}
+                                    {% endblocktranslate %}
                                 </span>
 
                                 <button slot="show-button" type="button" class="btn btn-sm btn-warning">{% translate 'Archive participations' %}</button>
@@ -127,7 +127,7 @@ <h3 class="m-0 me-1">{{ semester.name }}</h3>
                                         Do you really want to delete the grade documents in the semester <strong>{{ semester_name }}</strong>?
                                         This will delete all existing grade documents for this semester's courses and will disable new uploads.
                                         You can't undo this action.
-                                    {% endblocktrans %}
+                                    {% endblocktranslate %}
                                 </span>
 
                                 <button slot="show-button" type="button" class="btn btn-sm btn-warning">{% translate 'Delete grade documents' %}</button>
@@ -147,7 +147,7 @@ <h3 class="m-0 me-1">{{ semester.name }}</h3>
                                         Do you really want to archive the results in the semester <strong>{{ semester_name }}</strong>?
                                         This will make the results of all evaluations inaccessible for all users except their contributors and managers.
                                         You can't undo this action.
-                                    {% endblocktrans %}
+                                    {% endblocktranslate %}
                                 </span>
 
                                 <button slot="show-button" type="button" class="btn btn-sm btn-warning">{% translate 'Archive results' %}</button>
@@ -183,7 +183,7 @@ <h3 class="m-0 me-1">{{ semester.name }}</h3>
                                             Do you want to activate the reward points for the semester <strong>{{ semester_name }}</strong>?
                                             The activation will allow participants to receive reward points when voting and will also grant all eligible points for participants who have already voted so far.
                                             The process will take a while.
-                                        {% endblocktrans %}
+                                        {% endblocktranslate %}
                                     </span>
 
                                     <button slot="show-button" type="button" class="btn btn-sm btn-light{% if rewards_active %} active{% endif %}"><span class="fas fa-check" aria-hidden="true"></span></button>
@@ -564,7 +564,7 @@ <h3 class="m-0 me-1">{{ semester.name }}</h3>
                                                 <span slot="question">
                                                     {% blocktranslate trimmed with course_name=course.name %}
                                                         Do you really want to delete the course <strong>{{ course_name }}</strong>?
-                                                    {% endblocktrans %}
+                                                    {% endblocktranslate %}
                                                 </span>
 
                                                 <button slot="show-button" type="button" class="btn btn-sm btn-outline-danger" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Delete' %}">
diff --git a/evap/staff/templates/staff_semester_view_evaluation.html b/evap/staff/templates/staff_semester_view_evaluation.html
index 0ba710772c..7020ae5a83 100644
--- a/evap/staff/templates/staff_semester_view_evaluation.html
+++ b/evap/staff/templates/staff_semester_view_evaluation.html
@@ -147,12 +147,12 @@
                 {% if info_only or not request.user.is_manager %}
                     <span data-bs-toggle="tooltip" data-bs-placement="left" title="{% translate 'Grade documents (Midterm, Final)' %}">
                         <span class="fas fa-file"></span>
-                        {% blocktranslate with midterm=evaluation.midterm_grade_documents_count final=evaluation.final_grade_documents_count %}M: {{ midterm }}, F: {{ final }}{% endblocktrans %}
+                        {% blocktranslate with midterm=evaluation.midterm_grade_documents_count final=evaluation.final_grade_documents_count %}M: {{ midterm }}, F: {{ final }}{% endblocktranslate %}
                     </span>
                 {% else %}
                     <a href="{% url 'grades:course_view' evaluation.course.id %}" data-bs-toggle="tooltip" data-bs-placement="left" title="{% translate 'Grade documents (Midterm, Final)' %}">
                         <span class="fas fa-file"></span>
-                        {% blocktranslate with midterm=evaluation.midterm_grade_documents_count final=evaluation.final_grade_documents_count %}M: {{ midterm }}, F: {{ final }}{% endblocktrans %}
+                        {% blocktranslate with midterm=evaluation.midterm_grade_documents_count final=evaluation.final_grade_documents_count %}M: {{ midterm }}, F: {{ final }}{% endblocktranslate %}
                     </a>
                 {% endif %}
                 {% if evaluation.final_grade_documents_count %}
@@ -214,7 +214,7 @@
                 <span slot="question">
                     {% blocktranslate trimmed with evaluation_name=evaluation.full_name %}
                         Do you really want to delete the evaluation <strong>{{ evaluation_name }}</strong>?
-                    {% endblocktrans %}
+                    {% endblocktranslate %}
                 </span>
 
                 <button slot="show-button" type="button" class="btn btn-sm btn-outline-danger" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Delete' %}">
diff --git a/evap/staff/templates/staff_user_bulk_update.html b/evap/staff/templates/staff_user_bulk_update.html
index ea2fe952b7..224cfdf783 100644
--- a/evap/staff/templates/staff_user_bulk_update.html
+++ b/evap/staff/templates/staff_user_bulk_update.html
@@ -14,7 +14,7 @@ <h3>{% translate 'Bulk update users' %}</h3>
         {% csrf_token %}
         <div class="card mb-3">
             <div class="card-body">
-                <p>{% blocktranslate %}Upload a text file containing one user per line formatted as "username,email". Users in this file will be updated or created. All users that are not in this file will be deleted if possible. If they can't be deleted they will be marked inactive.{% endblocktrans %}</p>
+                <p>{% blocktranslate %}Upload a text file containing one user per line formatted as "username,email". Users in this file will be updated or created. All users that are not in this file will be deleted if possible. If they can't be deleted they will be marked inactive.{% endblocktranslate %}</p>
                 {% include 'bootstrap_form.html' with form=form %}
             </div>
         </div>
diff --git a/evap/staff/templates/staff_user_form.html b/evap/staff/templates/staff_user_form.html
index 5f6e19ffb4..99d05715bd 100644
--- a/evap/staff/templates/staff_user_form.html
+++ b/evap/staff/templates/staff_user_form.html
@@ -30,7 +30,7 @@ <h3>{% if form.instance.id %}{% translate 'Edit user' %}{% else %}{% translate '
                                 <span slot="question">
                                     {% blocktranslate trimmed %}
                                         The email will notify the user about all their due evaluations. Do you want to send the email now?
-                                    {% endblocktrans %}
+                                    {% endblocktranslate %}
                                 </span>
 
                                 <button slot="show-button" type="button" class="btn btn-sm btn-light">{% translate 'Resend evaluation started email' %}</button>
@@ -129,14 +129,14 @@ <h5 class="card-title me-auto">{% translate 'Export evaluation results' %}</h5>
                                 {% blocktranslate trimmed with user_fullname=form.instance.full_name %}
                                     Do you really want to delete the user <strong>{{ user_fullname }}</strong>?<br/>
                                     This person will also be removed from every other user having this person as a delegated or CC-user.
-                                {% endblocktrans %}
+                                {% endblocktranslate %}
                             </span>
 
                             <button slot="show-button" type="button" class="btn btn-danger">{% translate 'Delete user' %}</button>
                         </confirmation-modal>
                     </form>
                 {% else %}
-                    <span tabindex="0" data-bs-toggle="tooltip" title="{% blocktranslate %}This user contributes to an evaluation, participates in an evaluation whose participations haven't been archived yet or has special rights and as such cannot be deleted.{% endblocktrans %}">
+                    <span tabindex="0" data-bs-toggle="tooltip" title="{% blocktranslate %}This user contributes to an evaluation, participates in an evaluation whose participations haven't been archived yet or has special rights and as such cannot be deleted.{% endblocktranslate %}">
                     <button type="button" disabled class="btn btn-danger">
                         {% translate 'Delete user' %}
                     </button>
diff --git a/evap/staff/templates/staff_user_import.html b/evap/staff/templates/staff_user_import.html
index 13936511d4..ab3fe5a097 100644
--- a/evap/staff/templates/staff_user_import.html
+++ b/evap/staff/templates/staff_user_import.html
@@ -39,7 +39,7 @@ <h3>{% translate 'Import users' %}</h3>
                         <span slot="question">
                             {% blocktranslate trimmed %}
                                 Do you really want to import the users from the Excel file?
-                            {% endblocktrans %}
+                            {% endblocktranslate %}
                         </span>
 
                         <button slot="show-button" type="button" class="btn btn-primary form-submit-button">{% translate 'Import previously uploaded file' %}</button>
diff --git a/evap/staff/templates/staff_user_merge.html b/evap/staff/templates/staff_user_merge.html
index c8a2da4772..7d89361035 100644
--- a/evap/staff/templates/staff_user_merge.html
+++ b/evap/staff/templates/staff_user_merge.html
@@ -131,7 +131,7 @@ <h3>{% translate 'Merge users' %}</h3>
                         </td>
                     </tr>
                     <tr>
-                        <td><strong>{% blocktranslate %}CC'ing users{% endblocktrans %}</strong></td>
+                        <td><strong>{% blocktranslate %}CC'ing users{% endblocktranslate %}</strong></td>
                         <td{% if main_user.ccing_users.all %} class="table-info"{% endif %}>
                             {% for user in main_user.ccing_users.all %}
                                 {{ user.full_name }}{% if not forloop.last %},{% endif %}
@@ -239,7 +239,7 @@ <h3>{% translate 'Merge users' %}</h3>
         <div class="card card-submit-area text-center mb-3">
             <div class="card-body">
                 {% if errors %}
-                    {% blocktranslate %}The users can't be merged, because either contributions or participations for the same evaluation exist or the users are responsible for the same courses.{% endblocktrans %}
+                    {% blocktranslate %}The users can't be merged, because either contributions or participations for the same evaluation exist or the users are responsible for the same courses.{% endblocktranslate %}
                 {% elif warnings %}
                     <button type="submit" class="btn btn-warning"><span class="fas fa-triangle-exclamation"></span> {% translate 'Merge users' %}</button>
                 {% else %}
diff --git a/evap/student/templates/student_index_semester_evaluations_list.html b/evap/student/templates/student_index_semester_evaluations_list.html
index 98cea43c6d..506845165e 100644
--- a/evap/student/templates/student_index_semester_evaluations_list.html
+++ b/evap/student/templates/student_index_semester_evaluations_list.html
@@ -161,7 +161,7 @@
                                             {% elif evaluation.state == evaluation.State.PUBLISHED %}
                                                 {% include 'evaluation_result_widget.html' with course_or_evaluation=evaluation %}
                                             {% elif not evaluation.participates_in or evaluation.voted_for and evaluation.State.IN_EVALUATION <= evaluation.state and evaluation.state <= evaluation.State.REVIEWED %}
-                                                <div class="d-flex" data-bs-toggle="tooltip" data-bs-placement="left" title="{% if evaluation|weight_info %}{% blocktranslate with percentage=evaluation|weight_info %}This evaluation contributes {{ percentage }} to the final grade of the course.{% endblocktrans %} {% endif %}{% translate 'The results have not been published yet.' %}{% if evaluation.participates_in %} {% translate 'You will receive an email when the results are published.' %}{% endif %}">
+                                                <div class="d-flex" data-bs-toggle="tooltip" data-bs-placement="left" title="{% if evaluation|weight_info %}{% blocktranslate with percentage=evaluation|weight_info %}This evaluation contributes {{ percentage }} to the final grade of the course.{% endblocktranslate %} {% endif %}{% translate 'The results have not been published yet.' %}{% if evaluation.participates_in %} {% translate 'You will receive an email when the results are published.' %}{% endif %}">
                                                     {% include 'distribution_with_grade_disabled.html' with icon="fas fa-hourglass" weight_info=evaluation|weight_info %}
                                                 </div>
                                             {% endif %}
diff --git a/evap/student/templates/student_vote.html b/evap/student/templates/student_vote.html
index 1ac890f9ec..d512f1e879 100644
--- a/evap/student/templates/student_vote.html
+++ b/evap/student/templates/student_vote.html
@@ -22,9 +22,9 @@
             <div class="d-flex align-items-center justify-content-between">
                 <div class="p-2">
                     {% if contributor_errors_exist %}
-                        {% blocktranslate %}Please make sure to vote for all rating questions. You can also click on "I can't give feedback" to skip the questions about a single person.{% endblocktrans %}
+                        {% blocktranslate %}Please make sure to vote for all rating questions. You can also click on "I can't give feedback" to skip the questions about a single person.{% endblocktranslate %}
                     {% else %}
-                        {% blocktranslate %}Please make sure to vote for all rating questions.{% endblocktrans %}
+                        {% blocktranslate %}Please make sure to vote for all rating questions.{% endblocktranslate %}
                     {% endif %}
                 </div>
                 <button id="btn-jump-unanswered-question" type="button" class="btn btn-light float-end" data-bs-toggle="tooltip" data-bs-placement="left" title="{% translate 'Jump to the first unanswered question' %}">
@@ -47,7 +47,7 @@
         <div class="callout callout-info">
             <small>
                 <b>{% translate 'Questionnaire Preview' %}</b><br />
-                {% blocktranslate %}This is a preview of the questionnaire for the evaluation. Participants will see the questions below.{% endblocktrans %}
+                {% blocktranslate %}This is a preview of the questionnaire for the evaluation. Participants will see the questions below.{% endblocktranslate %}
             </small>
         </div>
     {% endif %}
@@ -61,10 +61,10 @@ <h3 class="mb-3">{{ evaluation.full_name }} ({{ evaluation.course.semester.name
                     <span class="fas fa-triangle-exclamation"></span> {% translate 'Small number of participants' %}
                 </div>
                 <div class="card-body tab-row">
-                    {% blocktranslate %}Only a small number of people can take part in this evaluation. You should be aware that contributors might be able to guess who voted for a specific answer and who wrote a text answer. Results will only be published if two or more people participated in the evaluation.{% endblocktrans %}
+                    {% blocktranslate %}Only a small number of people can take part in this evaluation. You should be aware that contributors might be able to guess who voted for a specific answer and who wrote a text answer. Results will only be published if two or more people participated in the evaluation.{% endblocktranslate %}
                     {% if evaluation.num_voters == 0 %}
                         <br />
-                        {% blocktranslate %}You're the first person taking part in this evaluation. If you want your text answers to be shown to the contributors even if you remain the only person taking part, please check the box below. Otherwise your text answers will be deleted if no other person takes part in the evaluation.{% endblocktrans %}
+                        {% blocktranslate %}You're the first person taking part in this evaluation. If you want your text answers to be shown to the contributors even if you remain the only person taking part, please check the box below. Otherwise your text answers will be deleted if no other person takes part in the evaluation.{% endblocktranslate %}
 
                         <div class="form-check mt-3">
                             <input class="form-check-input tab-selectable" id="text_results_publish_confirmation_top" type="checkbox"
@@ -96,7 +96,7 @@ <h3 class="mb-3">{{ evaluation.full_name }} ({{ evaluation.course.semester.name
                 <div class="card-body">
                     {% if not preview %}
                         <div class="callout callout-info">
-                            {% blocktranslate %}Please vote for all contributors you worked with. Click on "I can't give feedback" to skip a person.{% endblocktrans %}
+                            {% blocktranslate %}Please vote for all contributors you worked with. Click on "I can't give feedback" to skip a person.{% endblocktranslate %}
                         </div>
                     {% endif %}
 
@@ -137,7 +137,7 @@ <h3 class="mb-3">{{ evaluation.full_name }} ({{ evaluation.course.semester.name
                     <span class="fas fa-triangle-exclamation"></span> {% translate 'Small number of participants' %}
                 </div>
                 <div class="card-body tab-row">
-                    {% blocktranslate %}You're the first person taking part in this evaluation. If you want your text answers to be shown to the contributors even if you remain the only person taking part, please check the box below. Otherwise your text answers will be deleted if no other person takes part in the evaluation.{% endblocktrans %}
+                    {% blocktranslate %}You're the first person taking part in this evaluation. If you want your text answers to be shown to the contributors even if you remain the only person taking part, please check the box below. Otherwise your text answers will be deleted if no other person takes part in the evaluation.{% endblocktranslate %}
 
                     <div class="form-check mt-3">
                         <input class="form-check-input tab-selectable" id="text_results_publish_confirmation_bottom" type="checkbox"
@@ -162,7 +162,7 @@ <h3 class="mb-3">{{ evaluation.full_name }} ({{ evaluation.course.semester.name
                         <button id="vote-submit-btn" type="submit" class="btn btn-success tab-selectable">{% translate 'Submit questionnaire' %}</button>
                         <p id="submit-error-warning" style="display: none" class="text-danger">
                             <span class="fas fa-triangle-exclamation"></span>
-                            {% blocktranslate %}The server can't be reached. Your answers have been stored in your browser and it's safe to leave the page. Please try again later to submit the questionnaire.{% endblocktrans %}
+                            {% blocktranslate %}The server can't be reached. Your answers have been stored in your browser and it's safe to leave the page. Please try again later to submit the questionnaire.{% endblocktranslate %}
                         </p>
                     {% endif %}
                 </div>
diff --git a/evap/student/templates/student_vote_questionnaire_group.html b/evap/student/templates/student_vote_questionnaire_group.html
index d6d7f89c3a..8a2d468091 100644
--- a/evap/student/templates/student_vote_questionnaire_group.html
+++ b/evap/student/templates/student_vote_questionnaire_group.html
@@ -11,7 +11,7 @@ <h4 class="{% if not forloop.first %} mt-3 {% elif contributor %} me-auto {% end
                     data-mark-no-answers-for="{{ contributor.id }}"
                     {% if preview %}disabled{% endif %}
                 >
-                    {% blocktranslate %}I can't give feedback about this contributor{% endblocktrans %}
+                    {% blocktranslate %}I can't give feedback about this contributor{% endblocktranslate %}
                 </button>
             </div>
         {% endif%}
@@ -78,7 +78,7 @@ <h4 class="{% if not forloop.first %} mt-3 {% elif contributor %} me-auto {% end
                                         <textarea id="{{ field.id_for_label }}" class="form-control tab-selectable" name="{{ field.name }}"{% if preview %} disabled{% endif %}>{{ field.value|default_if_none:"" }}</textarea>
                                     </div>
                                     <div>
-                                        {% blocktranslate asvar intro_text %}After publishing, this text answer can be seen by:{% endblocktrans %}
+                                        {% blocktranslate asvar intro_text %}After publishing, this text answer can be seen by:{% endblocktranslate %}
                                         {% include 'textanswer_visibility_info.html' with intro_text=intro_text visible_by_contribution=textanswers_visible_to.visible_by_contribution visible_by_delegation_count=textanswers_visible_to.visible_by_delegation_count %}
                                     </div>
                                 </div>