diff --git a/external_services/models.py b/external_services/models.py
index 02f7a66d4..0fe998e67 100644
--- a/external_services/models.py
+++ b/external_services/models.py
@@ -300,6 +300,10 @@ def clean(self):
                 errors['menu_label'] = ValidationError(_(
                     'MENU_ITEM_ERROR_MENU_LABEL_REQUIRED_WHEN_NO_PRECONFIGURED_SERVICE_SELECTED'
                 ))
+        if self.service and self.menu_url and '://' in self.menu_url:
+            errors['menu_url'] = ValidationError(_(
+                'MENU_ITEM_ERROR_SCHEME_IN_MENU_URL_AND_PRECONFIGURED_SERVICE_SELECTED'
+            ))
         if errors:
             raise ValidationError(errors)
 
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index c00290009..3289e0854 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -409,6 +409,14 @@ msgstr "user tag"
 msgid "MODEL_NAME_USER_TAG_PLURAL"
 msgstr "user tags"
 
+#: course/models.py
+msgid "MODEL_NAME_SUBMISSION_TAG"
+msgstr "submission tag"
+
+#: course/models.py
+msgid "MODEL_NAME_SUBMISSION_TAG_PLURAL"
+msgstr "submission tags"
+
 #: course/models.py
 msgid "MODEL_NAME_HARDCODED_USER_TAG"
 msgstr "hardcoded user tag"
@@ -925,8 +933,8 @@ msgstr "Begin by enrolling in a course."
 msgid "SKIP_COURSE_NAVIGATION"
 msgstr "Skip course navigation"
 
-#: course/templates/course/_course_menu.html
-#: userprofile/templates/userprofile/profile.html
+#: course/templates/course/_course_menu.html news/models.py
+#: news/templates/news/list.html userprofile/templates/userprofile/profile.html
 msgid "LANGUAGE"
 msgstr "Language"
 
@@ -1117,6 +1125,10 @@ msgstr "Early access"
 msgid "COURSE_ARCHIVE"
 msgstr "Course archive"
 
+#: course/templates/course/course.html
+msgid "LEFT_OFF_REMINDER"
+msgstr "Continue where you left off"
+
 #: course/templates/course/course_base.html
 msgid "OPEN_SIDEBAR"
 msgstr "Open sidebar"
@@ -1274,6 +1286,9 @@ msgstr ""
 #: deviations/templates/deviations/remove_submissions.html
 #: edit_course/templates/edit_course/edit_model.html
 #: edit_course/templates/edit_course/remove_model.html
+#: edit_course/templates/edit_course/submissiontag_add.html
+#: edit_course/templates/edit_course/submissiontag_delete.html
+#: edit_course/templates/edit_course/submissiontag_edit.html
 #: edit_course/templates/edit_course/usertag_add.html
 #: edit_course/templates/edit_course/usertag_delete.html
 #: edit_course/templates/edit_course/usertag_edit.html
@@ -1312,6 +1327,8 @@ msgstr "Enrol students in the course"
 #: deviations/templates/deviations/_remove_modal.html
 #: edit_course/templates/edit_course/edit_content.html
 #: edit_course/templates/edit_course/remove_model.html
+#: edit_course/templates/edit_course/submissiontag_delete.html
+#: edit_course/templates/edit_course/submissiontag_list.html
 #: edit_course/templates/edit_course/usertag_delete.html
 #: edit_course/templates/edit_course/usertag_list.html
 #: external_services/templates/external_services/list_menu.html
@@ -1340,6 +1357,7 @@ msgstr "Created"
 
 #: course/templates/course/staff/group_edit.html
 #: course/templates/course/staff/groups.html
+#: edit_course/templates/edit_course/submissiontag_list.html
 #: edit_course/templates/edit_course/usertag_list.html
 #: exercise/templates/exercise/staff/inspect_submission.html
 #: external_services/templates/external_services/list_menu.html
@@ -1360,6 +1378,8 @@ msgstr "Edit group members"
 #: edit_course/templates/edit_course/edit_index.html
 #: edit_course/templates/edit_course/edit_instance.html
 #: edit_course/templates/edit_course/edit_model.html
+#: edit_course/templates/edit_course/submissiontag_add.html
+#: edit_course/templates/edit_course/submissiontag_edit.html
 #: edit_course/templates/edit_course/usertag_add.html
 #: edit_course/templates/edit_course/usertag_edit.html
 #: edit_course/templates/edit_course/usertagging_add.html
@@ -1383,10 +1403,6 @@ msgstr "Add new"
 msgid "FILTER_USERS_BY_TAG"
 msgstr "Filter users by tag"
 
-#: course/templates/course/staff/_assessment_panel.html
-msgid "FILTER_SUBMISSIONS_BY_TAG"
-msgstr "Filter submissions by tag"
-
 #: course/templates/course/staff/participants.html
 msgid "FILTER_USERS_BY_STATUS"
 msgstr "Filter users by status"
@@ -1450,20 +1466,10 @@ msgstr "Status"
 #: edit_course/templates/edit_course/usertag_edit.html
 #: edit_course/templates/edit_course/usertag_list.html
 #: edit_course/templates/edit_course/usertagging_add.html
+#: exercise/templates/exercise/staff/_submissions_table.html
 msgid "TAGS"
 msgstr "Tags"
 
-#: edit_course/templates/edit_course/submissiontag_add.html
-#: edit_course/templates/edit_course/submissiontag_delete.html
-#: edit_course/templates/edit_course/submissiontag_edit.html
-#: edit_course/templates/edit_course/submissiontag_list.html
-msgid "SUBMISSION_TAGS"
-msgstr "Submission tags"
-
-#: edit_course/templates/edit_course/submissiontag_list.html
-msgid "NO_SUBMISSION_TAGS"
-msgstr "No submission tags"
-
 #: course/templates/course/staff/participants.html
 msgid "ENROLLMENT_REMOVE_MODAL_REMOVE_TITLE"
 msgstr "Remove student"
@@ -1534,26 +1540,6 @@ msgstr "Assignment"
 msgid "LABEL_SUBMITTER_TAG"
 msgstr "Submitter tag"
 
-#: edit_course/course_forms.py
-msgid "LABEL_SUBMISSION_TAGS"
-msgstr "Submission tags"
-
-#: edit_course/course_forms.py
-msgid "LABEL_SUBMISSION_TAG"
-msgstr "Submission tag"
-
-#: edit_course/course_forms.py
-msgid "LABEL_SUBMISSION_TAGS_HELPTEXT"
-msgstr "Copy submission tags from this course instance."
-
-#: course/models.py
-msgid "MODEL_NAME_SUBMISSION_TAG"
-msgstr "submission tag"
-
-#: course/models.py
-msgid "MODEL_NAME_SUBMISSION_TAG_PLURAL"
-msgstr "submission tags"
-
 #: deviations/forms.py deviations/models.py exercise/submission_models.py
 msgid "LABEL_SUBMITTER"
 msgstr "Submitter"
@@ -1812,6 +1798,7 @@ msgstr "Grant time"
 #: deviations/templates/deviations/list_dl.html
 #: deviations/templates/deviations/list_submissions.html
 #: exercise/templates/exercise/staff/edit_submitters.html
+#: news/templates/news/list.html
 msgid "SELECT"
 msgstr "Select"
 
@@ -2114,6 +2101,14 @@ msgstr "Student tags"
 msgid "LABEL_STUDENT_TAGS_HELPTEXT"
 msgstr "Copy student tags from this course instance."
 
+#: edit_course/course_forms.py
+msgid "LABEL_SUBMISSION_TAGS"
+msgstr "Submission tags"
+
+#: edit_course/course_forms.py
+msgid "LABEL_SUBMISSION_TAGS_HELPTEXT"
+msgstr "Copy submission tags from this course instance."
+
 #: edit_course/course_forms.py
 msgid "LABEL_YEAR"
 msgstr "Year"
@@ -2753,6 +2748,14 @@ msgstr "Front page"
 msgid "MENU"
 msgstr "Menu"
 
+#: edit_course/templates/edit_course/edit_course_base.html
+#: edit_course/templates/edit_course/submissiontag_add.html
+#: edit_course/templates/edit_course/submissiontag_delete.html
+#: edit_course/templates/edit_course/submissiontag_edit.html
+#: edit_course/templates/edit_course/submissiontag_list.html
+msgid "SUBMISSION_TAGS"
+msgstr "Submission tags"
+
 #: edit_course/templates/edit_course/edit_course_base.html
 msgid "BATCH_ASSESS"
 msgstr "Batch assess"
@@ -2761,14 +2764,14 @@ msgstr "Batch assess"
 msgid "EDIT_GITMANAGER"
 msgstr "Edit Git manager settings"
 
-#: edit_course/templates/edit_course/edit_gitmanager.html
-msgid "EDIT_GITMANAGER_DESCRIPTION"
-msgstr "This action will update the course instance settings on Git manager."
-
 #: edit_course/templates/edit_course/edit_gitmanager.html
 msgid "OPEN_IN_GITMANAGER"
 msgstr "Open in Git manager"
 
+#: edit_course/templates/edit_course/edit_gitmanager.html
+msgid "EDIT_GITMANAGER_DESCRIPTION"
+msgstr "This action will update the course instance settings on Git manager."
+
 #: edit_course/templates/edit_course/edit_gitmanager.html
 msgid "UPDATING_GITMANAGER"
 msgstr "Updating Git manager..."
@@ -2846,14 +2849,55 @@ msgstr ""
 "The %(model)s <strong>%(name)s</strong> is not empty. Contained assignments "
 "must be removed first."
 
-#: edit_course/templates/edit_course/usertag_add.html
-msgid "ADD_NEW_USER_TAG"
-msgstr "Add new user tag"
-
 #: edit_course/templates/edit_course/submissiontag_add.html
+#: edit_course/templates/edit_course/submissiontag_list.html
 msgid "ADD_NEW_SUBMISSION_TAG"
 msgstr "Add new submission tag"
 
+#: edit_course/templates/edit_course/submissiontag_delete.html
+msgid "REMOVE_SUBMISSION_TAG"
+msgstr "Remove submission tag"
+
+#: edit_course/templates/edit_course/submissiontag_delete.html
+msgid "REMOVE_SUBMISSION_TAG_CONFIRMATION"
+msgstr "Remove submission tag"
+
+#: edit_course/templates/edit_course/submissiontag_delete.html
+msgid "REMOVE_SUBMISSION_TAG_CONFIRMATION_ALERT"
+msgstr "Are you sure you want to remove the following submission tag?"
+
+#: edit_course/templates/edit_course/submissiontag_edit.html
+msgid "EDIT_SUBMISSION_TAG"
+msgstr "Edit submission tag"
+
+#: edit_course/templates/edit_course/submissiontag_list.html
+#: edit_course/templates/edit_course/usertag_list.html
+msgid "TAG"
+msgstr "Tag"
+
+#: edit_course/templates/edit_course/submissiontag_list.html
+#: edit_course/templates/edit_course/usertag_list.html
+msgid "SLUG"
+msgstr "Slug"
+
+#: edit_course/templates/edit_course/submissiontag_list.html
+#: edit_course/templates/edit_course/usertag_list.html
+msgid "DESCRIPTION"
+msgstr "Description"
+
+#: edit_course/templates/edit_course/submissiontag_list.html
+#: edit_course/templates/edit_course/usertag_list.html
+msgid "ACTIONS"
+msgstr "Actions"
+
+#: edit_course/templates/edit_course/submissiontag_list.html
+msgid "NO_SUBMISSION_TAGS"
+msgstr "No submission tags"
+
+#: edit_course/templates/edit_course/usertag_add.html
+msgid "ADD_NEW_USER_TAG"
+msgstr "Add new user tag"
+
 #: edit_course/templates/edit_course/usertag_add.html
 msgid "ADD_STUDENT_TAG"
 msgstr "Add student tag"
@@ -2866,18 +2910,6 @@ msgstr "Remove user tag"
 msgid "REMOVE_USER_TAG_CONFIRMATION"
 msgstr "Confirm user tag removal"
 
-#: edit_course/templates/edit_course/submissiontag_delete.html
-msgid "REMOVE_SUBMISSION_TAG_CONFIRMATION"
-msgstr "Remove submission tag"
-
-#: edit_course/templates/edit_course/submissiontag_delete.html
-msgid "REMOVE_SUBMISSION_TAG"
-msgstr "Remove submission tag"
-
-#: edit_course/templates/edit_course/submissiontag_delete.html
-msgid "REMOVE_SUBMISSION_TAG_CONFIRMATION_ALERT"
-msgstr "Are you sure you want to remove the following submission tag?"
-
 #: edit_course/templates/edit_course/usertag_delete.html
 msgid "REMOVE_USER_TAG_CONFIRMATION_ALERT"
 msgstr "Are you sure you want to remove following user tag?"
@@ -2886,10 +2918,6 @@ msgstr "Are you sure you want to remove following user tag?"
 msgid "EDIT_STUDENT_TAG"
 msgstr "Edit student tag"
 
-#: edit_course/templates/edit_course/submissiontag_edit.html
-msgid "EDIT_SUBMISSION_TAG"
-msgstr "Edit submission tag"
-
 #: edit_course/templates/edit_course/usertag_list.html
 msgid "ADD_NEW_STUDENT_TAG"
 msgstr "Add new student tag"
@@ -2898,26 +2926,10 @@ msgstr "Add new student tag"
 msgid "STUDENT_TAGS"
 msgstr "Student tags"
 
-#: edit_course/templates/edit_course/usertag_list.html
-msgid "TAG"
-msgstr "Tag"
-
-#: edit_course/templates/edit_course/usertag_list.html
-msgid "SLUG"
-msgstr "Slug"
-
-#: edit_course/templates/edit_course/usertag_list.html
-msgid "DESCRIPTION"
-msgstr "Description"
-
 #: edit_course/templates/edit_course/usertag_list.html
 msgid "VISIBLE_TO_STUDENTS"
 msgstr "Visible to students"
 
-#: edit_course/templates/edit_course/usertag_list.html
-msgid "ACTIONS"
-msgstr "Actions"
-
 #: edit_course/templates/edit_course/usertag_list.html
 msgid "TAG_STUDENTS"
 msgstr "Tag students"
@@ -2930,10 +2942,6 @@ msgstr "No student tags."
 msgid "ADD_NEW_USER_TAGGING"
 msgstr "Add new user tagging"
 
-#: exercise/forms.py exercise/templates/exercise/staff/_assessment_panel.html
-msgid "ADD_TAGGING"
-msgstr "Add tagging"
-
 #: edit_course/views.py
 msgid "ERROR_EXERCISE_CATEGORY_MUST_EXIST_BEFORE_CREATEING_EXERCISES"
 msgstr ""
@@ -3866,6 +3874,10 @@ msgstr "submission"
 msgid "MODEL_NAME_SUBMISSION_PLURAL"
 msgstr "submissions"
 
+#: exercise/submission_models.py
+msgid "LABEL_SUBMISSION_TAG"
+msgstr "Submission tag"
+
 #: exercise/submission_models.py
 msgid "LABEL_ACTIVE"
 msgstr "active"
@@ -4334,6 +4346,10 @@ msgstr "Somebody"
 msgid "NOT_ASSESSED_MANUALLY"
 msgstr "Not assessed manually"
 
+#: exercise/templates/exercise/staff/_assessment_panel.html
+msgid "ADD_TAGGING"
+msgstr "Add tagging"
+
 #: exercise/templates/exercise/staff/_assessment_panel.html
 msgid "APPROVE_SUBMISSION"
 msgstr "Approve submission"
@@ -4343,6 +4359,10 @@ msgstr "Approve submission"
 msgid "SUBMISSION_DETAILS"
 msgstr "Submission details"
 
+#: exercise/templates/exercise/staff/_assessment_panel.html
+msgid "COMPARE_TO_MODEL"
+msgstr "Compare to model answer"
+
 #: exercise/templates/exercise/staff/_assessment_panel.html
 #: exercise/templates/exercise/staff/_resubmit_modal.html
 msgid "REGRADE_AUTOMATICALLY"
@@ -4497,6 +4517,14 @@ msgstr ""
 msgid "GROUP_BY_SUBMITTER"
 msgstr "Group by submitter"
 
+#: exercise/templates/exercise/staff/_submissions_table.html
+msgid "FILTER_SUBMISSIONS_BY_TAG"
+msgstr "Filter submissions by tag"
+
+#: exercise/templates/exercise/staff/_submissions_table.html
+msgid "GRADED"
+msgstr "graded"
+
 #: exercise/templates/exercise/staff/_submissions_table.html
 #: exercise/templates/exercise/staff/_submissions_table_compact.html
 msgid "TIME"
@@ -4547,10 +4575,6 @@ msgstr "This submission has been assessed manually by course staff."
 msgid "ASSESSED"
 msgstr "Assessed"
 
-#: exercise/templates/exercise/staff/_submissions_table_compact.html
-msgid "COMPARE_TO_MODEL"
-msgstr "Compare to model answer"
-
 #: exercise/templates/exercise/staff/_submissions_table_compact.html
 msgid "SHOW_ALL_SUBMISSIONS"
 msgstr "Show all submissions"
@@ -4685,12 +4709,12 @@ msgid "COMPARING_TO_NOT_FOUND"
 msgstr "The file you are attempting to compare to was not found."
 
 #: exercise/templates/exercise/staff/inspect_submission.html
-#| msgid "COMPARING_TO_SUBMISSION -- %(cs)s"
+#, python-format
 msgid "COMPARING_TO_SUBMISSION -- %(cs_url)s, %(cs_date)s"
 msgstr "Comparing to submission <a href=\"%(cs_url)s\">%(cs_date)s</a>."
 
 #: exercise/templates/exercise/staff/inspect_submission.html
-#| msgid "SHOW_ORIGINAL_SUBMISSION -- %(cs)s"
+#, python-format
 msgid "SHOW_ORIGINAL_SUBMISSION -- %(submission_url)s"
 msgstr "Show the <a href=\"%(submission_url)s\">original submission</a>."
 
@@ -5184,6 +5208,12 @@ msgid "MENU_ITEM_ERROR_MENU_LABEL_REQUIRED_WHEN_NO_PRECONFIGURED_SERVICE_SELECTE
 msgstr ""
 "A menu label is required when there is no preconfigured service selected."
 
+#: external_services/models.py
+msgid "MENU_ITEM_ERROR_SCHEME_IN_MENU_URL_AND_PRECONFIGURED_SERVICE_SELECTED"
+msgstr ""
+"Menu item URL must not begin with a protocol if an external service is "
+"selected."
+
 #: external_services/permissions.py
 msgid "MENU_VISIBILTY_PERMISSION_DENIED_MSG"
 msgstr "Unfortunately, you are not permitted to use this link."
@@ -5500,10 +5530,6 @@ msgstr "news items"
 msgid "ADD_NEWS_ITEM"
 msgstr "Add news item"
 
-#: news/templates/news/edit.html news/templates/news/list.html
-msgid "REMOVE_SELECTED_NEWS_ITEMS"
-msgstr "Remove selected news items"
-
 #: news/templates/news/list.html
 msgid "NEWS"
 msgstr "News"
@@ -5520,6 +5546,10 @@ msgstr "Audience"
 msgid "TITLE"
 msgstr "Title"
 
+#: news/templates/news/list.html
+msgid "REMOVE_SELECTED_NEWS_ITEMS"
+msgstr "Remove selected news items"
+
 #: news/templates/news/user_news.html
 msgid "COURSE_NEWS"
 msgstr "Course news"
@@ -5560,6 +5590,12 @@ msgstr "recipient"
 msgid "LABEL_SEEN"
 msgstr "seen"
 
+#: notification/models.py
+#, fuzzy
+#| msgid "LABEL_GRADE"
+msgid "LABEL_REGRADE_WHEN_SEEN"
+msgstr "grade"
+
 #: notification/models.py
 msgid "MODEL_NAME_NOTIFICATION"
 msgstr "notification"
@@ -5998,11 +6034,3 @@ msgstr "No system-wide accessibility statement found."
 #: userprofile/views.py
 msgid "NO_SUPPORT_PAGE"
 msgstr "No support page. Please notify administration!"
-
-#: exercise/templates/exercise/staff/_submissions_table.html
-msgid "GRADED"
-msgstr "graded"
-
-#: course/templates/course/index.html
-msgid "LEFT_OFF_REMINDER"
-msgstr "Continue where you left off"
diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po
index ecf9d7d13..e322251d3 100644
--- a/locale/fi/LC_MESSAGES/django.po
+++ b/locale/fi/LC_MESSAGES/django.po
@@ -410,6 +410,14 @@ msgstr "käyttäjämerkintä"
 msgid "MODEL_NAME_USER_TAG_PLURAL"
 msgstr "käyttäjämerkinnät"
 
+#: course/models.py
+msgid "MODEL_NAME_SUBMISSION_TAG"
+msgstr "palautusmerkintä"
+
+#: course/models.py
+msgid "MODEL_NAME_SUBMISSION_TAG_PLURAL"
+msgstr "palautusmerkinnät"
+
 #: course/models.py
 msgid "MODEL_NAME_HARDCODED_USER_TAG"
 msgstr "kovakoodattu käyttäjämerkintä"
@@ -931,8 +939,8 @@ msgstr "Aloita ilmoittautumalla jollekin kurssille."
 msgid "SKIP_COURSE_NAVIGATION"
 msgstr "Ohita kurssivalikko"
 
-#: course/templates/course/_course_menu.html
-#: userprofile/templates/userprofile/profile.html
+#: course/templates/course/_course_menu.html news/models.py
+#: news/templates/news/list.html userprofile/templates/userprofile/profile.html
 msgid "LANGUAGE"
 msgstr "Kieli"
 
@@ -1124,6 +1132,10 @@ msgstr "Aikainen pääsy"
 msgid "COURSE_ARCHIVE"
 msgstr "Kurssiarkisto"
 
+#: course/templates/course/course.html
+msgid "LEFT_OFF_REMINDER"
+msgstr ""
+
 #: course/templates/course/course_base.html
 msgid "OPEN_SIDEBAR"
 msgstr "Avaa sivupalkki"
@@ -1282,6 +1294,9 @@ msgstr ""
 #: deviations/templates/deviations/remove_submissions.html
 #: edit_course/templates/edit_course/edit_model.html
 #: edit_course/templates/edit_course/remove_model.html
+#: edit_course/templates/edit_course/submissiontag_add.html
+#: edit_course/templates/edit_course/submissiontag_delete.html
+#: edit_course/templates/edit_course/submissiontag_edit.html
 #: edit_course/templates/edit_course/usertag_add.html
 #: edit_course/templates/edit_course/usertag_delete.html
 #: edit_course/templates/edit_course/usertag_edit.html
@@ -1320,6 +1335,8 @@ msgstr "Ilmoita opiskelijoita kurssille"
 #: deviations/templates/deviations/_remove_modal.html
 #: edit_course/templates/edit_course/edit_content.html
 #: edit_course/templates/edit_course/remove_model.html
+#: edit_course/templates/edit_course/submissiontag_delete.html
+#: edit_course/templates/edit_course/submissiontag_list.html
 #: edit_course/templates/edit_course/usertag_delete.html
 #: edit_course/templates/edit_course/usertag_list.html
 #: external_services/templates/external_services/list_menu.html
@@ -1348,6 +1365,7 @@ msgstr "Luotu"
 
 #: course/templates/course/staff/group_edit.html
 #: course/templates/course/staff/groups.html
+#: edit_course/templates/edit_course/submissiontag_list.html
 #: edit_course/templates/edit_course/usertag_list.html
 #: exercise/templates/exercise/staff/inspect_submission.html
 #: external_services/templates/external_services/list_menu.html
@@ -1368,6 +1386,8 @@ msgstr "Muokkaa ryhmän jäseniä"
 #: edit_course/templates/edit_course/edit_index.html
 #: edit_course/templates/edit_course/edit_instance.html
 #: edit_course/templates/edit_course/edit_model.html
+#: edit_course/templates/edit_course/submissiontag_add.html
+#: edit_course/templates/edit_course/submissiontag_edit.html
 #: edit_course/templates/edit_course/usertag_add.html
 #: edit_course/templates/edit_course/usertag_edit.html
 #: edit_course/templates/edit_course/usertagging_add.html
@@ -1391,10 +1411,6 @@ msgstr "Lisää"
 msgid "FILTER_USERS_BY_TAG"
 msgstr "Suodata listaa merkinnän perusteella"
 
-#: course/templates/course/staff/_assessment_panel.html
-msgid "FILTER_SUBMISSIONS_BY_TAG"
-msgstr "Suodata listaa merkinnän perusteella"
-
 #: course/templates/course/staff/participants.html
 msgid "FILTER_USERS_BY_STATUS"
 msgstr "Suodata listaa tilan perusteella"
@@ -1458,20 +1474,10 @@ msgstr "Tila"
 #: edit_course/templates/edit_course/usertag_edit.html
 #: edit_course/templates/edit_course/usertag_list.html
 #: edit_course/templates/edit_course/usertagging_add.html
+#: exercise/templates/exercise/staff/_submissions_table.html
 msgid "TAGS"
 msgstr "Merkinnät"
 
-#: edit_course/templates/edit_course/submissiontag_add.html
-#: edit_course/templates/edit_course/submissiontag_delete.html
-#: edit_course/templates/edit_course/submissiontag_edit.html
-#: edit_course/templates/edit_course/submissiontag_list.html
-msgid "SUBMISSION_TAGS"
-msgstr "Palautusmerkinnät"
-
-#: edit_course/templates/edit_course/submissiontag_list.html
-msgid "NO_SUBMISSION_TAGS"
-msgstr "Ei palautusmerkintöjä"
-
 #: course/templates/course/staff/participants.html
 msgid "ENROLLMENT_REMOVE_MODAL_REMOVE_TITLE"
 msgstr "Poista opiskelija"
@@ -1543,26 +1549,6 @@ msgstr "Tehtävä"
 msgid "LABEL_SUBMITTER_TAG"
 msgstr "Opiskelijamerkintä"
 
-#: edit_course/course_forms.py
-msgid "LABEL_SUBMISSION_TAGS"
-msgstr "Palautusmerkinnät"
-
-#: edit_course/course_forms.py
-msgid "LABEL_SUBMISSION_TAG"
-msgstr "Palautusmerkintä"
-
-#: edit_course/course_forms.py
-msgid "LABEL_SUBMISSION_TAGS_HELPTEXT"
-msgstr "Kopioi palautusmerkinnät tästä kurssikerrasta."
-
-#: course/models.py
-msgid "MODEL_NAME_SUBMISSION_TAG"
-msgstr "palautusmerkintä"
-
-#: course/models.py
-msgid "MODEL_NAME_SUBMISSION_TAG_PLURAL"
-msgstr "palautusmerkinnät"
-
 #: deviations/forms.py deviations/models.py exercise/submission_models.py
 msgid "LABEL_SUBMITTER"
 msgstr "Opiskelija"
@@ -1823,6 +1809,7 @@ msgstr "Myöntämisaika"
 #: deviations/templates/deviations/list_dl.html
 #: deviations/templates/deviations/list_submissions.html
 #: exercise/templates/exercise/staff/edit_submitters.html
+#: news/templates/news/list.html
 msgid "SELECT"
 msgstr "Valitse"
 
@@ -2126,6 +2113,14 @@ msgstr "Opiskelijamerkinnät"
 msgid "LABEL_STUDENT_TAGS_HELPTEXT"
 msgstr "Kopioi opiskelijamerkinnät tästä kurssikerrasta."
 
+#: edit_course/course_forms.py
+msgid "LABEL_SUBMISSION_TAGS"
+msgstr "Palautusmerkinnät"
+
+#: edit_course/course_forms.py
+msgid "LABEL_SUBMISSION_TAGS_HELPTEXT"
+msgstr "Kopioi palautusmerkinnät tästä kurssikerrasta."
+
 #: edit_course/course_forms.py
 msgid "LABEL_YEAR"
 msgstr "Vuosi"
@@ -2768,6 +2763,14 @@ msgstr "Etusivu"
 msgid "MENU"
 msgstr "Valikko"
 
+#: edit_course/templates/edit_course/edit_course_base.html
+#: edit_course/templates/edit_course/submissiontag_add.html
+#: edit_course/templates/edit_course/submissiontag_delete.html
+#: edit_course/templates/edit_course/submissiontag_edit.html
+#: edit_course/templates/edit_course/submissiontag_list.html
+msgid "SUBMISSION_TAGS"
+msgstr "Palautusmerkinnät"
+
 #: edit_course/templates/edit_course/edit_course_base.html
 msgid "BATCH_ASSESS"
 msgstr "Joukkoarviointi"
@@ -2776,14 +2779,14 @@ msgstr "Joukkoarviointi"
 msgid "EDIT_GITMANAGER"
 msgstr "Muokkaa Git managerin asetuksia"
 
-#: edit_course/templates/edit_course/edit_gitmanager.html
-msgid "EDIT_GITMANAGER_DESCRIPTION"
-msgstr "Tämä toiminto päivittää kurssikerran asetuksia Git managerissa."
-
 #: edit_course/templates/edit_course/edit_gitmanager.html
 msgid "OPEN_IN_GITMANAGER"
 msgstr "Avaa Git managerissa"
 
+#: edit_course/templates/edit_course/edit_gitmanager.html
+msgid "EDIT_GITMANAGER_DESCRIPTION"
+msgstr "Tämä toiminto päivittää kurssikerran asetuksia Git managerissa."
+
 #: edit_course/templates/edit_course/edit_gitmanager.html
 msgid "UPDATING_GITMANAGER"
 msgstr "Päivitetään Git manageria..."
@@ -2861,26 +2864,11 @@ msgstr ""
 "Tämä %(model)s <strong>%(name)s</strong> ei ole tyhjä. Sen sisältämät "
 "tehtävät pitää poistaa ensin."
 
-#: edit_course/templates/edit_course/usertag_add.html
-msgid "ADD_NEW_USER_TAG"
-msgstr "Lisää käyttäjämerkintä"
-
 #: edit_course/templates/edit_course/submissiontag_add.html
+#: edit_course/templates/edit_course/submissiontag_list.html
 msgid "ADD_NEW_SUBMISSION_TAG"
 msgstr "Lisää palautusmerkintä"
 
-#: edit_course/templates/edit_course/usertag_add.html
-msgid "ADD_STUDENT_TAG"
-msgstr "Lisää opiskelijamerkintä"
-
-#: edit_course/templates/edit_course/usertag_delete.html
-msgid "REMOVE_USER_TAG"
-msgstr "Poista käyttäjämerkintä"
-
-#: edit_course/templates/edit_course/usertag_delete.html
-msgid "REMOVE_USER_TAG_CONFIRMATION"
-msgstr "Vahvista käyttäjämerkinnän poisto"
-
 #: edit_course/templates/edit_course/submissiontag_delete.html
 msgid "REMOVE_SUBMISSION_TAG"
 msgstr "Poista palautusmerkintä"
@@ -2893,46 +2881,70 @@ msgstr "Poista palautusmerkintä"
 msgid "REMOVE_SUBMISSION_TAG_CONFIRMATION_ALERT"
 msgstr "Haluatko varmasti poistaa tämän palautusmerkinnän?"
 
-#: edit_course/templates/edit_course/usertag_delete.html
-msgid "REMOVE_USER_TAG_CONFIRMATION_ALERT"
-msgstr "Haluatko varmasti poistaa seuraavan käyttäjämerkinnän?"
-
-#: edit_course/templates/edit_course/usertag_edit.html
-msgid "EDIT_STUDENT_TAG"
-msgstr "Muokkaa opiskelijamerkintää"
-
 #: edit_course/templates/edit_course/submissiontag_edit.html
 msgid "EDIT_SUBMISSION_TAG"
 msgstr "Muokkaa palautusmerkintää"
 
-#: edit_course/templates/edit_course/usertag_list.html
-msgid "ADD_NEW_STUDENT_TAG"
-msgstr "Lisää uusi opiskelijamerkintä"
-
-#: edit_course/templates/edit_course/usertag_list.html
-msgid "STUDENT_TAGS"
-msgstr "Opiskelijamerkinnät"
-
+#: edit_course/templates/edit_course/submissiontag_list.html
 #: edit_course/templates/edit_course/usertag_list.html
 msgid "TAG"
 msgstr "Merkintä"
 
+#: edit_course/templates/edit_course/submissiontag_list.html
 #: edit_course/templates/edit_course/usertag_list.html
 msgid "SLUG"
 msgstr "Tunniste"
 
+#: edit_course/templates/edit_course/submissiontag_list.html
 #: edit_course/templates/edit_course/usertag_list.html
 msgid "DESCRIPTION"
 msgstr "Kuvaus"
 
-#: edit_course/templates/edit_course/usertag_list.html
-msgid "VISIBLE_TO_STUDENTS"
-msgstr "Näkyy opiskelijoille"
-
+#: edit_course/templates/edit_course/submissiontag_list.html
 #: edit_course/templates/edit_course/usertag_list.html
 msgid "ACTIONS"
 msgstr "Toiminnot"
 
+#: edit_course/templates/edit_course/submissiontag_list.html
+msgid "NO_SUBMISSION_TAGS"
+msgstr "Ei palautusmerkintöjä"
+
+#: edit_course/templates/edit_course/usertag_add.html
+msgid "ADD_NEW_USER_TAG"
+msgstr "Lisää käyttäjämerkintä"
+
+#: edit_course/templates/edit_course/usertag_add.html
+msgid "ADD_STUDENT_TAG"
+msgstr "Lisää opiskelijamerkintä"
+
+#: edit_course/templates/edit_course/usertag_delete.html
+msgid "REMOVE_USER_TAG"
+msgstr "Poista käyttäjämerkintä"
+
+#: edit_course/templates/edit_course/usertag_delete.html
+msgid "REMOVE_USER_TAG_CONFIRMATION"
+msgstr "Vahvista käyttäjämerkinnän poisto"
+
+#: edit_course/templates/edit_course/usertag_delete.html
+msgid "REMOVE_USER_TAG_CONFIRMATION_ALERT"
+msgstr "Haluatko varmasti poistaa seuraavan käyttäjämerkinnän?"
+
+#: edit_course/templates/edit_course/usertag_edit.html
+msgid "EDIT_STUDENT_TAG"
+msgstr "Muokkaa opiskelijamerkintää"
+
+#: edit_course/templates/edit_course/usertag_list.html
+msgid "ADD_NEW_STUDENT_TAG"
+msgstr "Lisää uusi opiskelijamerkintä"
+
+#: edit_course/templates/edit_course/usertag_list.html
+msgid "STUDENT_TAGS"
+msgstr "Opiskelijamerkinnät"
+
+#: edit_course/templates/edit_course/usertag_list.html
+msgid "VISIBLE_TO_STUDENTS"
+msgstr "Näkyy opiskelijoille"
+
 #: edit_course/templates/edit_course/usertag_list.html
 msgid "TAG_STUDENTS"
 msgstr "Merkitse opiskelijoita"
@@ -2945,10 +2957,6 @@ msgstr "Ei opiskelijamerkintöjä."
 msgid "ADD_NEW_USER_TAGGING"
 msgstr "Merkitse opiskelijoita"
 
-#: exercise/forms.py exercise/templates/exercise/staff/_assessment_panel.html
-msgid "ADD_TAGGING"
-msgstr "Lisää merkintä"
-
 #: edit_course/views.py
 msgid "ERROR_EXERCISE_CATEGORY_MUST_EXIST_BEFORE_CREATEING_EXERCISES"
 msgstr ""
@@ -3876,6 +3884,10 @@ msgstr "palautus"
 msgid "MODEL_NAME_SUBMISSION_PLURAL"
 msgstr "palautukset"
 
+#: exercise/submission_models.py
+msgid "LABEL_SUBMISSION_TAG"
+msgstr "Palautusmerkintä"
+
 #: exercise/submission_models.py
 msgid "LABEL_ACTIVE"
 msgstr "aktiivinen"
@@ -4347,6 +4359,10 @@ msgstr "Joku"
 msgid "NOT_ASSESSED_MANUALLY"
 msgstr "Ei arvosteltu manuaalisesti"
 
+#: exercise/templates/exercise/staff/_assessment_panel.html
+msgid "ADD_TAGGING"
+msgstr "Lisää merkintä"
+
 #: exercise/templates/exercise/staff/_assessment_panel.html
 msgid "APPROVE_SUBMISSION"
 msgstr "Hyväksy pisteytetyksi"
@@ -4356,6 +4372,10 @@ msgstr "Hyväksy pisteytetyksi"
 msgid "SUBMISSION_DETAILS"
 msgstr "Palautuksen lisätiedot"
 
+#: exercise/templates/exercise/staff/_assessment_panel.html
+msgid "COMPARE_TO_MODEL"
+msgstr "Vertaa mallivastaukseen"
+
 #: exercise/templates/exercise/staff/_assessment_panel.html
 #: exercise/templates/exercise/staff/_resubmit_modal.html
 msgid "REGRADE_AUTOMATICALLY"
@@ -4512,6 +4532,14 @@ msgstr ""
 msgid "GROUP_BY_SUBMITTER"
 msgstr "Ryhmittele palauttajittain"
 
+#: exercise/templates/exercise/staff/_submissions_table.html
+msgid "FILTER_SUBMISSIONS_BY_TAG"
+msgstr "Suodata listaa merkinnän perusteella"
+
+#: exercise/templates/exercise/staff/_submissions_table.html
+msgid "GRADED"
+msgstr "arvosteltu"
+
 #: exercise/templates/exercise/staff/_submissions_table.html
 #: exercise/templates/exercise/staff/_submissions_table_compact.html
 msgid "TIME"
@@ -4538,7 +4566,6 @@ msgid "NUMBER_ABBREVIATED"
 msgstr "Nro"
 
 #: exercise/templates/exercise/staff/_submissions_table_compact.html
-#| msgid "INCOMPLETE"
 msgid "COMPARE"
 msgstr "Vertaa"
 
@@ -4562,11 +4589,6 @@ msgstr "Kurssin henkilökunta on arvostellut tämän palautuksen manuaalisesti."
 msgid "ASSESSED"
 msgstr "Arvosteltu"
 
-#: exercise/templates/exercise/staff/_submissions_table_compact.html
-#| msgid "COURSE_MODULES"
-msgid "COMPARE_TO_MODEL"
-msgstr "Vertaa mallivastaukseen"
-
 #: exercise/templates/exercise/staff/_submissions_table_compact.html
 msgid "SHOW_ALL_SUBMISSIONS"
 msgstr "Näytä kaikki palautukset"
@@ -4697,17 +4719,16 @@ msgid "COMPARING_TO_MODEL"
 msgstr "Verrataan mallivastaukseen."
 
 #: exercise/templates/exercise/staff/inspect_submission.html
-#| msgid "FILE_NOT_FOUND"
 msgid "COMPARING_TO_NOT_FOUND"
 msgstr "Tiedostoa, johon yrität verrata, ei löytynyt."
 
 #: exercise/templates/exercise/staff/inspect_submission.html
-#| msgid "EXCEPTION_PARSING_SUBMISSION_JSON -- {error!s}"
+#, python-format
 msgid "COMPARING_TO_SUBMISSION -- %(cs_url)s, %(cs_date)s"
 msgstr "Verrataan palautukseen <a href=\"%(cs_url)s\">%(cs_date)s</a>."
 
 #: exercise/templates/exercise/staff/inspect_submission.html
-#| msgid "SHOW_ALL_SUBMISSIONS"
+#, python-format
 msgid "SHOW_ORIGINAL_SUBMISSION -- %(submission_url)s"
 msgstr "Näytä <a href=\"%(submission_url)s\">alkuperäinen palautus</a>."
 
@@ -5206,6 +5227,11 @@ msgstr ""
 msgid "MENU_ITEM_ERROR_MENU_LABEL_REQUIRED_WHEN_NO_PRECONFIGURED_SERVICE_SELECTED"
 msgstr "Nimi on pakollinen, kun palvelua ei ole annetussa valikoimassa."
 
+#: external_services/models.py
+msgid "MENU_ITEM_ERROR_SCHEME_IN_MENU_URL_AND_PRECONFIGURED_SERVICE_SELECTED"
+msgstr ""
+"Linkin URL ei saa alkaa protokollalla, jos ulkopuolinen palvelu on valittu."
+
 #: external_services/permissions.py
 msgid "MENU_VISIBILTY_PERMISSION_DENIED_MSG"
 msgstr "Valitettavasti sinulla ei ole oikeutta käyttää tätä linkkiä."
@@ -5524,10 +5550,6 @@ msgstr "uutiset"
 msgid "ADD_NEWS_ITEM"
 msgstr "Lisää uutinen"
 
-#: news/templates/news/edit.html news/templates/news/list.html
-msgid "REMOVE_SELECTED_NEWS_ITEMS"
-msgstr "Poista valitut uutiset"
-
 #: news/templates/news/list.html
 msgid "NEWS"
 msgstr "Uutiset"
@@ -5544,6 +5566,10 @@ msgstr "Yleisö"
 msgid "TITLE"
 msgstr "Otsikko"
 
+#: news/templates/news/list.html
+msgid "REMOVE_SELECTED_NEWS_ITEMS"
+msgstr "Poista valitut uutiset"
+
 #: news/templates/news/user_news.html
 msgid "COURSE_NEWS"
 msgstr "Kurssiuutiset"
@@ -5584,6 +5610,12 @@ msgstr "vastaanottaja"
 msgid "LABEL_SEEN"
 msgstr "nähty"
 
+#: notification/models.py
+#, fuzzy
+#| msgid "LABEL_GRADE"
+msgid "LABEL_REGRADE_WHEN_SEEN"
+msgstr "arvosana"
+
 #: notification/models.py
 msgid "MODEL_NAME_NOTIFICATION"
 msgstr "ilmoitus"
@@ -6028,11 +6060,3 @@ msgstr "Järjestelmätason saavutettavuusselostetta ei löytynyt."
 #: userprofile/views.py
 msgid "NO_SUPPORT_PAGE"
 msgstr "Ei tukisivua. Ota yhteys ylläpitäjään!"
-
-#: exercise/templates/exercise/staff/_submissions_table.html
-msgid "GRADED"
-msgstr "arvosteltu"
-
-#: course/templates/course/index.html
-msgid "CONTINUE"
-msgstr "Jatka siitä, mihin jäit"