Skip to content

Commit

Permalink
Merge branch 'dev' into laupoh-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
laupoh authored Jul 1, 2024
2 parents 14e0417 + 5a26ccc commit d4d9ef7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions ui/src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@
"i18n_exam_copied": "Exam has been copied",
"i18n_select_role": "Select a user role that you want to log in",
"i18n_exam_trial_count": "The number of allowed attempts.",
"i18n_exam_trial_count_description": "How many times the exam can be taken before evaluation",
"i18n_exam_trial_count_description": "How many times the exam can be taken before evaluation. The student can book a new time for this exam once the exam is evaluated.",
"i18n_no_trials_left": "You have used all your attempts for this exam so retake is not possible. Please contact the examiner.",
"i18n_trial": "How many attempts the student has for this exam.",
"i18n_permit_retrial": "Release",
Expand Down Expand Up @@ -1142,7 +1142,7 @@
"i18n_participations_title": "Study attainments",
"i18n_collaborative_participations_title": "Attainments of joint exams",
"i18n_enrolment_title": "Exam details",
"i18n_reservation_title": "Book an exam visit",
"i18n_reservation_title": "Book an exam",
"i18n_external_reservation_title": "Book an exam visit",
"i18n_collaborative_reservation_title": "Book a joint exam",
"i18n_examination_title": "Examination",
Expand Down
6 changes: 3 additions & 3 deletions ui/src/assets/i18n/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -1176,7 +1176,7 @@
"i18n_exam_question_in_use": "Tenter där frågan används",
"i18n_reviewed_questions": "Bedömda frågor",
"i18n_unanswered_questions_remain": "Det finns obesvarade frågor i sektionen",
"i18n_unsaved_changes": "Unsaved changes SV",
"i18n_type_to_start_search": "Skriv för att börja söka SV",
"i18n_datepicker": "Välj datum SV"
"i18n_unsaved_changes": "Osparade ändringar",
"i18n_type_to_start_search": "Skriv för att börja söka",
"i18n_datepicker": "Välj datum"
}

0 comments on commit d4d9ef7

Please sign in to comment.