Compare revisions

Jonathan Weth · Jonathan Weth · Tom Teichler · Tom Teichler · Jonathan Weth · Jonathan Weth
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,6 @@ db.sqlite3
 # Sphinx
 docs/_build/
+# Test
+.tox/
--- a/aleksis/apps/alsijil/forms.py
+++ b/aleksis/apps/alsijil/forms.py
@@ -11,13 +11,13 @@ from material import Layout, Row
 from aleksis.apps.chronos.managers import TimetableType
 from aleksis.core.models import Group, Person
-from .models import ExcuseType, LessonDocumentation, PersonalNote, PersonalNoteFilter
+from .models import ExcuseType, ExtraMark, LessonDocumentation, PersonalNote
 class LessonDocumentationForm(forms.ModelForm):
    class Meta:
        model = LessonDocumentation
-        fields = ["topic", "homework"]
+        fields = ["topic", "homework", "group_note"]
    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)
@@ -28,7 +28,7 @@ class LessonDocumentationForm(forms.ModelForm):
 class PersonalNoteForm(forms.ModelForm):
    class Meta:
        model = PersonalNote
-        fields = ["absent", "late", "excused", "excuse_type", "remarks"]
+        fields = ["absent", "late", "excused", "excuse_type", "extra_marks", "remarks"]
    person_name = forms.CharField(disabled=True)
@@ -109,12 +109,12 @@ class RegisterAbsenceForm(forms.Form):
    remarks = forms.CharField(label=_("Remarks"), max_length=30, required=False)
-class PersonalNoteFilterForm(forms.ModelForm):
+class ExtraMarkForm(forms.ModelForm):
-    layout = Layout(Row("identifier", "description"), Row("regex"))
+    layout = Layout("short_name", "name")
    class Meta:
-        model = PersonalNoteFilter
+        model = ExtraMark
-        fields = ["identifier", "description", "regex"]
+        fields = ["short_name", "name"]
 class ExcuseTypeForm(forms.ModelForm):

--- a/aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-01 13:20+0200\n"
+"POT-Creation-Date: 2020-08-03 20:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,53 +16,62 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: forms.py:41
+#: forms.py:25
+msgid "Homework for the next lesson"
+msgstr ""
+#: forms.py:50 templates/alsijil/print/full_register.html:199
 msgid "Group"
 msgstr ""
-#: forms.py:49 templates/alsijil/print/full_register.html:101
+#: forms.py:56 templates/alsijil/print/full_register.html:170
+#: templates/alsijil/print/full_register.html:201
 msgid "Teacher"
 msgstr ""
-#: forms.py:57
+#: forms.py:73
-msgid "Room"
+msgid "You can't select a group and a teacher both."
 msgstr ""
-#: forms.py:70
+#: forms.py:101
 msgid "Start date"
 msgstr ""
-#: forms.py:73
+#: forms.py:102
 msgid "End date"
 msgstr ""
-#: forms.py:75
+#: forms.py:103
 msgid "From period"
 msgstr ""
-#: forms.py:77 templates/alsijil/lesson.html:58
+#: forms.py:105 templates/alsijil/class_register/lesson.html:163
 msgid "Person"
 msgstr ""
-#: forms.py:79 templates/alsijil/lesson.html:59
+#: forms.py:107 templates/alsijil/class_register/lesson.html:164
-#: templates/alsijil/print/full_register.html:223
+#: templates/alsijil/class_register/week_view.html:109
-#: templates/alsijil/week_view.html:96
+#: templates/alsijil/print/full_register.html:75
+#: templates/alsijil/print/full_register.html:312
 msgid "Absent"
 msgstr ""
-#: forms.py:80 templates/alsijil/lesson.html:61
+#: forms.py:108 templates/alsijil/class_register/lesson.html:166
+#: templates/alsijil/print/full_register.html:84
+#: templates/alsijil/print/full_register.html:275
 msgid "Excused"
 msgstr ""
-#: forms.py:81 templates/alsijil/lesson.html:62
+#: forms.py:109 templates/alsijil/class_register/lesson.html:170
-#: templates/alsijil/print/full_register.html:225
+#: templates/alsijil/class_register/lesson.html:223
+#: templates/alsijil/class_register/lesson.html:231
+#: templates/alsijil/print/full_register.html:314
 msgid "Remarks"
 msgstr ""
-#: menus.py:6 templates/alsijil/print/full_register.html:16
+#: menus.py:6 preferences.py:8 templates/alsijil/print/full_register.html:16
 msgid "Class register"
 msgstr ""
@@ -78,306 +87,484 @@ msgstr ""
 msgid "Register absence"
 msgstr ""
-#: menus.py:34
+#: menus.py:34 models.py:32 templates/alsijil/excuse_type/list.html:8
-msgid "Personal note filters"
+#: templates/alsijil/excuse_type/list.html:9
+msgid "Excuse types"
+msgstr ""
+#: menus.py:40 models.py:66 models.py:138
+#: templates/alsijil/class_register/lesson.html:168
+#: templates/alsijil/extra_mark/list.html:8
+#: templates/alsijil/extra_mark/list.html:9
+#: templates/alsijil/print/full_register.html:293
+msgid "Extra marks"
+msgstr ""
+#: models.py:18 models.py:124
+msgid "Short name"
+msgstr ""
+#: models.py:20 models.py:126
+msgid "Name"
+msgstr ""
+#: models.py:31 models.py:60 templates/alsijil/class_register/lesson.html:167
+#: templates/alsijil/class_register/lesson.html:202
+msgid "Excuse type"
 msgstr ""
-#: models.py:51 templates/alsijil/print/full_register.html:271
+#: models.py:75
+msgid "Personal note"
+msgstr ""
+#: models.py:76 templates/alsijil/class_register/lesson.html:64
+#: templates/alsijil/class_register/lesson.html:156
+#: templates/alsijil/class_register/week_view.html:104
+msgid "Personal notes"
+msgstr ""
+#: models.py:99 templates/alsijil/class_register/week_view.html:56
+#: templates/alsijil/print/full_register.html:371
 msgid "Lesson topic"
 msgstr ""
-#: models.py:52 templates/alsijil/print/full_register.html:272
+#: models.py:100 templates/alsijil/print/full_register.html:372
 msgid "Homework"
 msgstr ""
-#: models.py:68
+#: models.py:102
-msgid "Identifier"
+msgid "Group note"
+msgstr ""
+#: models.py:106 templates/alsijil/class_register/lesson.html:60
+#: templates/alsijil/class_register/lesson.html:143
+msgid "Lesson documentation"
+msgstr ""
+#: models.py:107
+msgid "Lesson documentations"
 msgstr ""
-#: models.py:71 templates/alsijil/print/full_register.html:178
+#: models.py:137
-msgid "Description"
+msgid "Extra mark"
 msgstr ""
-#: models.py:74
+#: preferences.py:16
-msgid "Match expression"
+msgid "Block adding personal notes for cancelled lessons"
 msgstr ""
-#: tables.py:14
+#: tables.py:16 tables.py:36
 msgid "Edit"
 msgstr ""
-#: templates/alsijil/lesson.html:5
+#: tables.py:22 tables.py:42
+msgid "Delete"
+msgstr ""
+#: templates/alsijil/absences/register.html:5
+#: templates/alsijil/absences/register.html:6
+msgid "Manage absence"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:6
 msgid "Lesson"
 msgstr ""
-#: templates/alsijil/lesson.html:34
+#: templates/alsijil/class_register/lesson.html:14
-msgid "Lesson documentation"
+#: templates/alsijil/class_register/lesson.html:83
+#, python-format
+msgid "%(period)s. period"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:38
+msgid "Previous lesson"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:46
+msgid "Next lesson"
 msgstr ""
-#: templates/alsijil/lesson.html:43
+#: templates/alsijil/class_register/lesson.html:68
+#: templates/alsijil/class_register/lesson.html:249
 msgid "Change history"
 msgstr ""
-#: templates/alsijil/lesson.html:52 templates/alsijil/week_view.html:91
+#: templates/alsijil/class_register/lesson.html:82
-msgid "Personal notes"
+msgid "Overview: Previous lesson"
 msgstr ""
-#: templates/alsijil/lesson.html:60
+#: templates/alsijil/class_register/lesson.html:89
-#: templates/alsijil/print/full_register.html:202
+msgid "Lesson topic of previous lesson:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:96
+msgid "Homework for this lesson:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:103
+msgid "Group notes for previous lesson:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:110
+msgid "Absent persons:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:117
+msgid "Late persons:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:165
+#: templates/alsijil/print/full_register.html:287
 msgid "Tardiness"
 msgstr ""
-#: templates/alsijil/manage_personal_note_filter.html:5
+#: templates/alsijil/class_register/lesson.html:188
-#: templates/alsijil/manage_personal_note_filter.html:6
+msgid "Tardiness (in m)"
-msgid "Manage personal note filter"
 msgstr ""
-#: templates/alsijil/manage_personal_note_filter.html:11
+#: templates/alsijil/class_register/week_view.html:6
-msgid "Delete filter"
+msgid "Week view"
 msgstr ""
-#: templates/alsijil/personal_note_filters.html:7
+#: templates/alsijil/class_register/week_view.html:27
-#: templates/alsijil/personal_note_filters.html:8
+msgid "Select"
-msgid "List of all personal note filters"
 msgstr ""
-#: templates/alsijil/personal_note_filters.html:12
+#: templates/alsijil/class_register/week_view.html:33
-msgid "Add filter"
+#, python-format
+msgid "CW %(week)s: %(instance)s"
 msgstr ""
-#: templates/alsijil/print/full_register.html:22
+#: templates/alsijil/class_register/week_view.html:50
-#: templates/alsijil/print/full_register.html:54
+msgid "Period"
-msgid "Owners"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:52
+msgid "Groups"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:54
+#: templates/alsijil/print/full_register.html:169
+#: templates/alsijil/print/full_register.html:200
+msgid "Subject"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:55
+msgid "Teachers"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:110
+msgid "unexcused"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:113
+msgid "Summed up tardiness"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:142
+msgid "No lessons available"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:145
+msgid ""
+"\n"
+"            There are no lessons for the selected group or teacher in this week.\n"
+"          "
+msgstr ""
+#: templates/alsijil/excuse_type/create.html:6
+#: templates/alsijil/excuse_type/create.html:7
+#: templates/alsijil/excuse_type/list.html:16
+msgid "Create excuse type"
+msgstr ""
+#: templates/alsijil/excuse_type/edit.html:6
+#: templates/alsijil/excuse_type/edit.html:7
+msgid "Edit excuse type"
+msgstr ""
+#: templates/alsijil/excuse_type/warning.html:5
+msgid ""
+"\n"
+"      This function should only be used to define alternatives to the default excuse which also will be counted extra.\n"
+"      Don't use this to create a default excuse or if you don't divide between different types of excuse.\n"
+"    "
+msgstr ""
+#: templates/alsijil/extra_mark/create.html:6
+#: templates/alsijil/extra_mark/create.html:7
+#: templates/alsijil/extra_mark/list.html:14
+msgid "Create extra mark"
+msgstr ""
+#: templates/alsijil/extra_mark/edit.html:6
+#: templates/alsijil/extra_mark/edit.html:7
+msgid "Edit extra mark"
+msgstr ""
+#: templates/alsijil/partials/absences.html:4
+#: templates/alsijil/print/full_register.html:126
+msgid "(e)"
+msgstr ""
+#: templates/alsijil/partials/absences.html:4
+#: templates/alsijil/print/full_register.html:130
+msgid "(u)"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:6
+msgid "Data complete"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:12
+#: templates/alsijil/print/full_register.html:406
+msgid "Lesson cancelled"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:14
+msgid "Missing data"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:16
+msgid "Pending"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:18
+msgid "Substitution"
+msgstr ""
+#: templates/alsijil/print/full_register.html:6
+msgid "Class register:"
 msgstr ""
 #: templates/alsijil/print/full_register.html:26
+#: templates/alsijil/print/full_register.html:59
+msgid "Owners"
+msgstr ""
+#: templates/alsijil/print/full_register.html:30
 msgid "Printed on"
 msgstr ""
-#: templates/alsijil/print/full_register.html:34
+#: templates/alsijil/print/full_register.html:38
 msgid ""
 "\n"
-"            This printout is intended for archival purposes. The main copy "
+"        This printout is intended for archival purposes. The main copy of\n"
-"of\n"
+"        the class register is stored in the AlekSIS School Information\n"
-"            the class register is stored in the AlekSIS School Information\n"
+"        System.\n"
-"            System.\n"
+"      "
-"          "
 msgstr ""
-#: templates/alsijil/print/full_register.html:41
+#: templates/alsijil/print/full_register.html:45
 msgid ""
 "\n"
-"            Copies of the class register, both digital and as printout, "
+"        Copies of the class register, both digital and as printout, must\n"
-"must\n"
+"        only be kept inside the school and/or on devices authorised by the\n"
-"            only be kept inside the school and/or on devices authorised by "
+"        school.\n"
-"the\n"
+"      "
-"            school.\n"
-"          "
 msgstr ""
-#: templates/alsijil/print/full_register.html:48
+#: templates/alsijil/print/full_register.html:52
 msgid ""
 "\n"
-"            The owner of the group and the headteacher confirm the above, "
+"        The owner of the group and the headteacher confirm the above, as\n"
-"as\n"
+"        well as the correctness of this printout.\n"
-"            well as the correctness of this printout.\n"
+"      "
-"          "
 msgstr ""
-#: templates/alsijil/print/full_register.html:55
+#: templates/alsijil/print/full_register.html:62
 msgid "Headteacher"
 msgstr ""
-#: templates/alsijil/print/full_register.html:61
+#: templates/alsijil/print/full_register.html:69
+msgid "Abbreviations"
+msgstr ""
+#: templates/alsijil/print/full_register.html:71
+msgid "General"
+msgstr ""
+#: templates/alsijil/print/full_register.html:78
+msgid "Late"
+msgstr ""
+#: templates/alsijil/print/full_register.html:81
+#: templates/alsijil/print/full_register.html:283
+msgid "Unexcused"
+msgstr ""
+#: templates/alsijil/print/full_register.html:89
+msgid "Custom excuse types"
+msgstr ""
+#: templates/alsijil/print/full_register.html:101
+msgid "Available extra marks"
+msgstr ""
+#: templates/alsijil/print/full_register.html:115
 msgid "Persons in group"
 msgstr ""
-#: templates/alsijil/print/full_register.html:66
+#: templates/alsijil/print/full_register.html:120
 msgid "No."
 msgstr ""
-#: templates/alsijil/print/full_register.html:67
+#: templates/alsijil/print/full_register.html:121
 msgid "Last name"
 msgstr ""
-#: templates/alsijil/print/full_register.html:68
+#: templates/alsijil/print/full_register.html:122
 msgid "First name"
 msgstr ""
-#: templates/alsijil/print/full_register.html:69
+#: templates/alsijil/print/full_register.html:123
 msgid "Sex"
 msgstr ""
-#: templates/alsijil/print/full_register.html:70
+#: templates/alsijil/print/full_register.html:124
 msgid "Date of birth"
 msgstr ""
-#: templates/alsijil/print/full_register.html:71
+#: templates/alsijil/print/full_register.html:125
-#: templates/alsijil/print/full_register.html:200
+msgid "(a)"
-msgid "Absences"
 msgstr ""
-#: templates/alsijil/print/full_register.html:72
+#: templates/alsijil/print/full_register.html:131
-#: templates/alsijil/print/full_register.html:201
+msgid "(b)"
-msgid "Unexcused"
 msgstr ""
-#: templates/alsijil/print/full_register.html:73
+#: templates/alsijil/print/full_register.html:164
-#: templates/alsijil/print/full_register.html:224
-msgid "Tard."
-msgstr ""
-#: templates/alsijil/print/full_register.html:95
 msgid "Teachers and lessons in group"
 msgstr ""
-#: templates/alsijil/print/full_register.html:100
+#: templates/alsijil/print/full_register.html:171
-#: templates/alsijil/week_view.html:48
+#: templates/alsijil/print/full_register.html:202
-msgid "Subject"
-msgstr ""
-#: templates/alsijil/print/full_register.html:102
 msgid "Lesson start"
 msgstr ""
-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:172
+#: templates/alsijil/print/full_register.html:203
 msgid "Lesson end"
 msgstr ""
-#: templates/alsijil/print/full_register.html:104
+#: templates/alsijil/print/full_register.html:173
+#: templates/alsijil/print/full_register.html:204
 msgid "Per week"
 msgstr ""
-#: templates/alsijil/print/full_register.html:124
+#: templates/alsijil/print/full_register.html:194
+msgid "Teachers and lessons in child groups"
+msgstr ""
+#: templates/alsijil/print/full_register.html:227
 msgid "Personal overview"
 msgstr ""
-#: templates/alsijil/print/full_register.html:126
+#: templates/alsijil/print/full_register.html:229
 msgid "Contact details"
 msgstr ""
-#: templates/alsijil/print/full_register.html:174
+#: templates/alsijil/print/full_register.html:266
-msgid "Statistics on remarks"
+msgid "Absences and tardiness"
 msgstr ""
-#: templates/alsijil/print/full_register.html:179
+#: templates/alsijil/print/full_register.html:269
-msgid "Count"
+msgid "Absences"
 msgstr ""
-#: templates/alsijil/print/full_register.html:196
+#: templates/alsijil/print/full_register.html:274
-msgid "Absences and tardiness"
+msgid "thereof"
 msgstr ""
-#: templates/alsijil/print/full_register.html:215
+#: templates/alsijil/print/full_register.html:304
 msgid "Relevant personal notes"
 msgstr ""
-#: templates/alsijil/print/full_register.html:219
+#: templates/alsijil/print/full_register.html:308
 msgid "Date"
 msgstr ""
-#: templates/alsijil/print/full_register.html:220
+#: templates/alsijil/print/full_register.html:309
-#: templates/alsijil/print/full_register.html:268
+#: templates/alsijil/print/full_register.html:369
 msgid "Pe."
 msgstr ""
-#: templates/alsijil/print/full_register.html:221
+#: templates/alsijil/print/full_register.html:310
-#: templates/alsijil/print/full_register.html:269
+#: templates/alsijil/print/full_register.html:370
 msgid "Subj."
 msgstr ""
-#: templates/alsijil/print/full_register.html:222
+#: templates/alsijil/print/full_register.html:311
-#: templates/alsijil/print/full_register.html:274
+#: templates/alsijil/print/full_register.html:374
 msgid "Te."
 msgstr ""
-#: templates/alsijil/print/full_register.html:240
+#: templates/alsijil/print/full_register.html:313
-msgid "Yes"
+msgid "Tard."
 msgstr ""
-#: templates/alsijil/print/full_register.html:242
+#: templates/alsijil/print/full_register.html:330
-#: templates/alsijil/print/full_register.html:314
+msgid "Yes"
-#: templates/alsijil/print/full_register.html:324
-msgid "e"
 msgstr ""
-#: templates/alsijil/print/full_register.html:262
+#: templates/alsijil/print/full_register.html:335
-msgid "Lesson documentation for calendar week"
+#: templates/alsijil/print/full_register.html:424
+#: templates/alsijil/print/full_register.html:439
+msgid "e"
 msgstr ""
-#: templates/alsijil/print/full_register.html:270
+#: templates/alsijil/print/full_register.html:363
-msgid "Subs."
+msgid "Lesson documentation for week"
 msgstr ""
-#: templates/alsijil/print/full_register.html:273
+#: templates/alsijil/print/full_register.html:373
 msgid "Notes"
 msgstr ""
-#: templates/alsijil/print/full_register.html:301
+#: views.py:76
-msgid "Lesson cancelled"
+msgid "You either selected an invalid lesson or there is currently no lesson in progress."
 msgstr ""
-#: templates/alsijil/register_absence.html:5
+#: views.py:90
-#: templates/alsijil/register_absence.html:6
+msgid "You are not allowed to create a lesson documentation for a lesson in the future."
-msgid "Manage absence"
 msgstr ""
-#: templates/alsijil/week_view.html:6
+#: views.py:116
-msgid "Week view"
+msgid "The lesson documentation has been saved."
 msgstr ""
-#: templates/alsijil/week_view.html:21
+#: views.py:136
-msgid "Select"
+msgid "The personal notes have been saved."
 msgstr ""
-#: templates/alsijil/week_view.html:47
+#: views.py:327
-msgid "Period"
+msgid "There is no current school term."
-msgstr ""
-#: templates/alsijil/week_view.html:49
-msgid "Teachers"
-msgstr ""
-#: templates/alsijil/week_view.html:97
-msgid "unexcused"
 msgstr ""
-#: templates/alsijil/week_view.html:100
+#: views.py:463
-msgid "Summed up tardiness"
+msgid "The absence has been saved."
-msgstr ""
-#: templates/alsijil/week_view.html:122
-msgid "No group selected"
 msgstr ""
-#: templates/alsijil/week_view.html:125
+#: views.py:488
-msgid ""
+msgid "The extra mark has been created."
-"\n"
-"            There are no lessons for the selected group, teacher, room or "
-"time.\n"
-"          "
 msgstr ""
-#: views.py:56
+#: views.py:499
-msgid ""
+msgid "The extra mark has been saved."
-"You either selected an invalid lesson or there is currently no lesson in "
-"progress."
 msgstr ""
-#: views.py:68
+#: views.py:509
-msgid ""
+msgid "The extra mark has been deleted."
-"You are not allowed to create a lesson documentation for a lesson in the "
-"future."
 msgstr ""
-#: views.py:306
+#: views.py:529
-msgid "The absence has been saved."
+msgid "The excuse type has been created."
 msgstr ""
-#: views.py:344
+#: views.py:540
-msgid "The filter has been saved"
+msgid "The excuse type has been saved."
 msgstr ""
-#: views.py:360
+#: views.py:550
-msgid "The filter has been deleted."
+msgid "The excuse type has been deleted."
 msgstr ""
--- a/aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po
@@ -7,62 +7,72 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-01 13:20+0200\n"
+"POT-Creation-Date: 2020-08-03 20:03+0200\n"
-"PO-Revision-Date: 2019-11-24 21:56+0000\n"
+"PO-Revision-Date: 2020-08-03 18:41+0000\n"
-"Last-Translator: Tom Teichler <tom.teichler@teckids.org>\n"
+"Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
-"Language-Team: German <https://translate.edugit.org/projects/aleksis-sis/"
+"Language-Team: German <https://translate.edugit.org/projects/aleksis/"
 "aleksis-app-alsijil/de/>\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.8\n"
+"X-Generator: Weblate 4.0.1\n"
-#: forms.py:41
+#: forms.py:25
+msgid "Homework for the next lesson"
+msgstr "Hausaufgabe zur nächsten Stunde"
+#: forms.py:50 templates/alsijil/print/full_register.html:199
 msgid "Group"
 msgstr "Gruppe"
-#: forms.py:49 templates/alsijil/print/full_register.html:101
+#: forms.py:56 templates/alsijil/print/full_register.html:170
+#: templates/alsijil/print/full_register.html:201
 msgid "Teacher"
 msgstr "Lehrkraft"
-#: forms.py:57
+#: forms.py:73
-msgid "Room"
+msgid "You can't select a group and a teacher both."
-msgstr "Raum"
+msgstr "Es kann nur entweder eine Gruppe oder eine Lehrkraft ausgewählt werden."
-#: forms.py:70
+#: forms.py:101
 msgid "Start date"
 msgstr "Startdatum"
-#: forms.py:73
+#: forms.py:102
 msgid "End date"
 msgstr "Enddatum"
-#: forms.py:75
+#: forms.py:103
 msgid "From period"
 msgstr "Ab Stunde"
-#: forms.py:77 templates/alsijil/lesson.html:58
+#: forms.py:105 templates/alsijil/class_register/lesson.html:163
 msgid "Person"
 msgstr "Person"
-#: forms.py:79 templates/alsijil/lesson.html:59
+#: forms.py:107 templates/alsijil/class_register/lesson.html:164
-#: templates/alsijil/print/full_register.html:223
+#: templates/alsijil/class_register/week_view.html:109
-#: templates/alsijil/week_view.html:96
+#: templates/alsijil/print/full_register.html:75
+#: templates/alsijil/print/full_register.html:312
 msgid "Absent"
 msgstr "Abwesend"
-#: forms.py:80 templates/alsijil/lesson.html:61
+#: forms.py:108 templates/alsijil/class_register/lesson.html:166
+#: templates/alsijil/print/full_register.html:84
+#: templates/alsijil/print/full_register.html:275
 msgid "Excused"
 msgstr "Entschuldigt"
-#: forms.py:81 templates/alsijil/lesson.html:62
+#: forms.py:109 templates/alsijil/class_register/lesson.html:170
-#: templates/alsijil/print/full_register.html:225
+#: templates/alsijil/class_register/lesson.html:223
+#: templates/alsijil/class_register/lesson.html:231
+#: templates/alsijil/print/full_register.html:314
 msgid "Remarks"
 msgstr "Bemerkungen"
-#: menus.py:6 templates/alsijil/print/full_register.html:16
+#: menus.py:6 preferences.py:8 templates/alsijil/print/full_register.html:16
 msgid "Class register"
 msgstr "Klassenbuch"
@@ -78,341 +88,558 @@ msgstr "Aktuelle Woche"
 msgid "Register absence"
 msgstr "Abwesenheit eintragen"
-#: menus.py:34
+#: menus.py:34 models.py:32 templates/alsijil/excuse_type/list.html:8
-msgid "Personal note filters"
+#: templates/alsijil/excuse_type/list.html:9
-msgstr "Filter für persönliche Notizen"
+msgid "Excuse types"
+msgstr "Entschuldigungsarten"
+#: menus.py:40 models.py:66 models.py:138
+#: templates/alsijil/class_register/lesson.html:168
+#: templates/alsijil/extra_mark/list.html:8
+#: templates/alsijil/extra_mark/list.html:9
+#: templates/alsijil/print/full_register.html:293
+msgid "Extra marks"
+msgstr "Zusätzliche Markierungen"
+#: models.py:18 models.py:124
+msgid "Short name"
+msgstr "Kurzname"
+#: models.py:20 models.py:126
+msgid "Name"
+msgstr "Name"
+#: models.py:31 models.py:60 templates/alsijil/class_register/lesson.html:167
+#: templates/alsijil/class_register/lesson.html:202
+msgid "Excuse type"
+msgstr "Entschuldigungsart"
+#: models.py:75
+msgid "Personal note"
+msgstr "Persönliche Notiz"
+#: models.py:76 templates/alsijil/class_register/lesson.html:64
+#: templates/alsijil/class_register/lesson.html:156
+#: templates/alsijil/class_register/week_view.html:104
+msgid "Personal notes"
+msgstr "Persönliche Notizen"
-#: models.py:51 templates/alsijil/print/full_register.html:271
+#: models.py:99 templates/alsijil/class_register/week_view.html:56
+#: templates/alsijil/print/full_register.html:371
 msgid "Lesson topic"
 msgstr "Stundenthema"
-#: models.py:52 templates/alsijil/print/full_register.html:272
+#: models.py:100 templates/alsijil/print/full_register.html:372
 msgid "Homework"
 msgstr "Hausaufgaben"
-#: models.py:68
+#: models.py:102
-msgid "Identifier"
+msgid "Group note"
-msgstr "Kennung"
+msgstr "Gruppennotiz"
+#: models.py:106 templates/alsijil/class_register/lesson.html:60
+#: templates/alsijil/class_register/lesson.html:143
+msgid "Lesson documentation"
+msgstr "Stunden-Dokumentation"
+#: models.py:107
+msgid "Lesson documentations"
+msgstr "Stunden-Dokumentationen"
-#: models.py:71 templates/alsijil/print/full_register.html:178
+#: models.py:137
-msgid "Description"
+msgid "Extra mark"
-msgstr "Beschreibung"
+msgstr "Zusätzliche Markierung"
-#: models.py:74
+#: preferences.py:16
-msgid "Match expression"
+msgid "Block adding personal notes for cancelled lessons"
-msgstr "Suchausdruck"
+msgstr ""
+"Blockiere das Hinzufügen von persönlichen Notizen für ausgefallene Stunden"
-#: tables.py:14
+#: tables.py:16 tables.py:36
 msgid "Edit"
 msgstr "Bearbeiten"
-#: templates/alsijil/lesson.html:5
+#: tables.py:22 tables.py:42
-#, fuzzy
+msgid "Delete"
-#| msgid "Lessons"
+msgstr "Löschen"
+#: templates/alsijil/absences/register.html:5
+#: templates/alsijil/absences/register.html:6
+msgid "Manage absence"
+msgstr "Abwesenheiten verwalten"
+#: templates/alsijil/class_register/lesson.html:6
 msgid "Lesson"
-msgstr "Unterrichtsstunden"
+msgstr "Unterrichtsstunde"
-#: templates/alsijil/lesson.html:34
+#: templates/alsijil/class_register/lesson.html:14
-msgid "Lesson documentation"
+#: templates/alsijil/class_register/lesson.html:83
-msgstr "Stunden-Dokumentation"
+#, python-format
+msgid "%(period)s. period"
+msgstr "%(period)s. Stunde"
+#: templates/alsijil/class_register/lesson.html:38
+msgid "Previous lesson"
+msgstr "Vorherige Unterrichtsstunde"
-#: templates/alsijil/lesson.html:43
+#: templates/alsijil/class_register/lesson.html:46
+msgid "Next lesson"
+msgstr "Nächste Unterrichtsstunde"
+#: templates/alsijil/class_register/lesson.html:68
+#: templates/alsijil/class_register/lesson.html:249
 msgid "Change history"
 msgstr "Veränderungen"
-#: templates/alsijil/lesson.html:52 templates/alsijil/week_view.html:91
+#: templates/alsijil/class_register/lesson.html:82
-msgid "Personal notes"
+msgid "Overview: Previous lesson"
-msgstr "Persönliche Notizen"
+msgstr "Übersicht: Vorherige Stunde"
-#: templates/alsijil/lesson.html:60
+#: templates/alsijil/class_register/lesson.html:89
-#: templates/alsijil/print/full_register.html:202
+msgid "Lesson topic of previous lesson:"
+msgstr "Stundenthema der vorherigen Stunde:"
+#: templates/alsijil/class_register/lesson.html:96
+msgid "Homework for this lesson:"
+msgstr "Hausaufgaben zu dieser Stunde:"
+#: templates/alsijil/class_register/lesson.html:103
+msgid "Group notes for previous lesson:"
+msgstr "Gruppennotizen für die vorherige Stunde:"
+#: templates/alsijil/class_register/lesson.html:110
+msgid "Absent persons:"
+msgstr "Abwesende Personen:"
+#: templates/alsijil/class_register/lesson.html:117
+msgid "Late persons:"
+msgstr "Verspätete Personen:"
+#: templates/alsijil/class_register/lesson.html:165
+#: templates/alsijil/print/full_register.html:287
 msgid "Tardiness"
 msgstr "Verspätung"
-#: templates/alsijil/manage_personal_note_filter.html:5
+#: templates/alsijil/class_register/lesson.html:188
-#: templates/alsijil/manage_personal_note_filter.html:6
+msgid "Tardiness (in m)"
-msgid "Manage personal note filter"
+msgstr "Verspätung (in m)"
-msgstr "Filter für persönliche Notizen verwalten"
-#: templates/alsijil/manage_personal_note_filter.html:11
+#: templates/alsijil/class_register/week_view.html:6
-#, fuzzy
+msgid "Week view"
-#| msgid "Personal note filters"
+msgstr "Wochenansicht"
-msgid "Delete filter"
-msgstr "Filter für persönliche Notizen"
+#: templates/alsijil/class_register/week_view.html:27
+msgid "Select"
+msgstr "Auswählen"
+#: templates/alsijil/class_register/week_view.html:33
+#, python-format
+msgid "CW %(week)s: %(instance)s"
+msgstr "KW %(week)s: %(instance)s"
+#: templates/alsijil/class_register/week_view.html:50
+msgid "Period"
+msgstr "Stunde"
+#: templates/alsijil/class_register/week_view.html:52
+msgid "Groups"
+msgstr "Gruppen"
+#: templates/alsijil/class_register/week_view.html:54
+#: templates/alsijil/print/full_register.html:169
+#: templates/alsijil/print/full_register.html:200
+msgid "Subject"
+msgstr "Fach"
-#: templates/alsijil/personal_note_filters.html:7
+#: templates/alsijil/class_register/week_view.html:55
-#: templates/alsijil/personal_note_filters.html:8
+msgid "Teachers"
-msgid "List of all personal note filters"
+msgstr "Lehrkräfte"
-msgstr "Liste aller Filter für persönliche Notizen"
+#: templates/alsijil/class_register/week_view.html:110
+msgid "unexcused"
+msgstr "unentschuldigt"
+#: templates/alsijil/class_register/week_view.html:113
+msgid "Summed up tardiness"
+msgstr "Summierte Verspätung"
+#: templates/alsijil/class_register/week_view.html:142
+msgid "No lessons available"
+msgstr "Keine Stunden verfügbar"
+#: templates/alsijil/class_register/week_view.html:145
+msgid ""
+"\n"
+"            There are no lessons for the selected group or teacher in this week.\n"
+"          "
+msgstr ""
+"\n"
+"            Es gibt keine Stunden für die ausgewählte Gruppe oder Lehrkraft in dieser Woche.\n"
+"          "
+#: templates/alsijil/excuse_type/create.html:6
+#: templates/alsijil/excuse_type/create.html:7
+#: templates/alsijil/excuse_type/list.html:16
+msgid "Create excuse type"
+msgstr "Entschuldigungsart erstellen"
-#: templates/alsijil/personal_note_filters.html:12
+#: templates/alsijil/excuse_type/edit.html:6
-msgid "Add filter"
+#: templates/alsijil/excuse_type/edit.html:7
+msgid "Edit excuse type"
+msgstr "Entschuldigungsart bearbeiten"
+#: templates/alsijil/excuse_type/warning.html:5
+msgid ""
+"\n"
+"      This function should only be used to define alternatives to the default excuse which also will be counted extra.\n"
+"      Don't use this to create a default excuse or if you don't divide between different types of excuse.\n"
+"    "
 msgstr ""
+"\n"
+"      Diese Funktion sollte nur benutzt werden, um Alternativen zur normalen Entschuldigung, welche von sich aus extra gezählt wird, zu definieren.\n"
+"Benutzen Sie diese Funktion nicht, um eine Entschuldigungsart für normale Entschuldigungen zu erstellen oder wenn Sie nicht zwischen verschiedenen Entschuldigungsarten unterscheiden möchten.\n"
+"    "
+#: templates/alsijil/extra_mark/create.html:6
+#: templates/alsijil/extra_mark/create.html:7
+#: templates/alsijil/extra_mark/list.html:14
+msgid "Create extra mark"
+msgstr "Zusätzliche Markierung erstellen"
+#: templates/alsijil/extra_mark/edit.html:6
+#: templates/alsijil/extra_mark/edit.html:7
+msgid "Edit extra mark"
+msgstr "Zusätzliche Markierung bearbeiten"
+#: templates/alsijil/partials/absences.html:4
+#: templates/alsijil/print/full_register.html:126
+msgid "(e)"
+msgstr "(e)"
-#: templates/alsijil/print/full_register.html:22
+#: templates/alsijil/partials/absences.html:4
-#: templates/alsijil/print/full_register.html:54
+#: templates/alsijil/print/full_register.html:130
+msgid "(u)"
+msgstr "(u)"
+#: templates/alsijil/partials/lesson_status_icon.html:6
+msgid "Data complete"
+msgstr "Daten vollständig"
+#: templates/alsijil/partials/lesson_status_icon.html:12
+#: templates/alsijil/print/full_register.html:406
+msgid "Lesson cancelled"
+msgstr "Stunde ist ausgefallen"
+#: templates/alsijil/partials/lesson_status_icon.html:14
+msgid "Missing data"
+msgstr "Fehlende Daten"
+#: templates/alsijil/partials/lesson_status_icon.html:16
+msgid "Pending"
+msgstr "Findet gerade statt"
+#: templates/alsijil/partials/lesson_status_icon.html:18
+msgid "Substitution"
+msgstr "Vertretung"
+#: templates/alsijil/print/full_register.html:6
+msgid "Class register:"
+msgstr "Klassenbuch:"
+#: templates/alsijil/print/full_register.html:26
+#: templates/alsijil/print/full_register.html:59
 msgid "Owners"
 msgstr "Leiter/-innen"
-#: templates/alsijil/print/full_register.html:26
+#: templates/alsijil/print/full_register.html:30
 msgid "Printed on"
 msgstr "Gedruckt am"
-#: templates/alsijil/print/full_register.html:34
+#: templates/alsijil/print/full_register.html:38
 msgid ""
 "\n"
-"            This printout is intended for archival purposes. The main copy "
+"        This printout is intended for archival purposes. The main copy of\n"
-"of\n"
+"        the class register is stored in the AlekSIS School Information\n"
-"            the class register is stored in the AlekSIS School Information\n"
+"        System.\n"
-"            System.\n"
+"      "
-"          "
 msgstr ""
 "\n"
-"            Dieser Ausdruck ist für Archivierungszwecke gedacht. Die "
+"        Dieser Ausdruck ist für Archivierungszwecke gedacht. Die Hauptkopie\n"
-"Hauptkopie\n"
+"            des Klassenbuches ist im AlekSIS-Schul-Informations-System gespeichert.\n"
-"            des Klassenbusches ist im AlekSIS-Schul-Informations-System "
+"      "
-"gespeichert.\n"
-"          "
-#: templates/alsijil/print/full_register.html:41
+#: templates/alsijil/print/full_register.html:45
 msgid ""
 "\n"
-"            Copies of the class register, both digital and as printout, "
+"        Copies of the class register, both digital and as printout, must\n"
-"must\n"
+"        only be kept inside the school and/or on devices authorised by the\n"
-"            only be kept inside the school and/or on devices authorised by "
+"        school.\n"
-"the\n"
+"      "
-"            school.\n"
-"          "
 msgstr ""
 "\n"
-"            Kopien des Klassenbuches, sowohl digital als auch als Ausdruck, "
+"        Kopien des Klassenbuches, sowohl digital als auch als Ausdruck, dürfen\n"
-"dürfen\n"
+"            ausschließlich in der Schule und/oder auf von der Schule autorisierten Geräten\n"
-"            ausschließlich in der Schule und/oder auf vonder Schule "
-"autorisierten Geräten\n"
 "            gespeichert werden.\n"
-"          "
+"      "
-#: templates/alsijil/print/full_register.html:48
+#: templates/alsijil/print/full_register.html:52
 msgid ""
 "\n"
-"            The owner of the group and the headteacher confirm the above, "
+"        The owner of the group and the headteacher confirm the above, as\n"
-"as\n"
+"        well as the correctness of this printout.\n"
-"            well as the correctness of this printout.\n"
+"      "
-"          "
 msgstr ""
 "\n"
-"            Die Leitung der Gruppe sowie die Schulleitung bestätigen die "
+"        Die Leitung der Gruppe sowie die Schulleitung bestätigen die obigen Hinweise sowie\n"
-"obigen Hinweise sowie\n"
 "            die Richtigkeit des Ausdrucks.\n"
-"          "
+"      "
-#: templates/alsijil/print/full_register.html:55
+#: templates/alsijil/print/full_register.html:62
 msgid "Headteacher"
 msgstr "Schulleitung"
-#: templates/alsijil/print/full_register.html:61
+#: templates/alsijil/print/full_register.html:69
+msgid "Abbreviations"
+msgstr "Abkürzungen"
+#: templates/alsijil/print/full_register.html:71
+msgid "General"
+msgstr "Allgemein"
+#: templates/alsijil/print/full_register.html:78
+msgid "Late"
+msgstr "Verspätet"
+#: templates/alsijil/print/full_register.html:81
+#: templates/alsijil/print/full_register.html:283
+msgid "Unexcused"
+msgstr "Unentschuldigt"
+#: templates/alsijil/print/full_register.html:89
+msgid "Custom excuse types"
+msgstr "Benutzerdefinierte Entschuldigunsarten"
+#: templates/alsijil/print/full_register.html:101
+msgid "Available extra marks"
+msgstr "Verfügbare zusätzliche Markierungen"
+#: templates/alsijil/print/full_register.html:115
 msgid "Persons in group"
 msgstr "Personen in der Gruppe"
-#: templates/alsijil/print/full_register.html:66
+#: templates/alsijil/print/full_register.html:120
 msgid "No."
 msgstr "Nr."
-#: templates/alsijil/print/full_register.html:67
+#: templates/alsijil/print/full_register.html:121
 msgid "Last name"
 msgstr "Nachname"
-#: templates/alsijil/print/full_register.html:68
+#: templates/alsijil/print/full_register.html:122
 msgid "First name"
 msgstr "Vorname"
-#: templates/alsijil/print/full_register.html:69
+#: templates/alsijil/print/full_register.html:123
 msgid "Sex"
 msgstr "Geschlecht"
-#: templates/alsijil/print/full_register.html:70
+#: templates/alsijil/print/full_register.html:124
 msgid "Date of birth"
 msgstr "Geburtsdatum"
-#: templates/alsijil/print/full_register.html:71
+#: templates/alsijil/print/full_register.html:125
-#: templates/alsijil/print/full_register.html:200
+msgid "(a)"
-msgid "Absences"
+msgstr "(a)"
-msgstr "Abwesenheiten"
-#: templates/alsijil/print/full_register.html:72
-#: templates/alsijil/print/full_register.html:201
-msgid "Unexcused"
-msgstr "Unentschuldigt"
-#: templates/alsijil/print/full_register.html:73
+#: templates/alsijil/print/full_register.html:131
-#: templates/alsijil/print/full_register.html:224
+msgid "(b)"
-msgid "Tard."
+msgstr "(b)"
-msgstr "Verspät."
-#: templates/alsijil/print/full_register.html:95
+#: templates/alsijil/print/full_register.html:164
 msgid "Teachers and lessons in group"
 msgstr "Lehrkräfte und Fächer der Gruppe"
-#: templates/alsijil/print/full_register.html:100
+#: templates/alsijil/print/full_register.html:171
-#: templates/alsijil/week_view.html:48
+#: templates/alsijil/print/full_register.html:202
-msgid "Subject"
-msgstr "Fach"
-#: templates/alsijil/print/full_register.html:102
 msgid "Lesson start"
 msgstr "Unterrichtsbeginn"
-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:172
+#: templates/alsijil/print/full_register.html:203
 msgid "Lesson end"
 msgstr "Unterrichtsende"
-#: templates/alsijil/print/full_register.html:104
+#: templates/alsijil/print/full_register.html:173
+#: templates/alsijil/print/full_register.html:204
 msgid "Per week"
 msgstr "Pro Woche"
-#: templates/alsijil/print/full_register.html:124
+#: templates/alsijil/print/full_register.html:194
+msgid "Teachers and lessons in child groups"
+msgstr "Lehrkräfte und Fächer von Untergruppen"
+#: templates/alsijil/print/full_register.html:227
 msgid "Personal overview"
 msgstr "Persönliche Übersicht"
-#: templates/alsijil/print/full_register.html:126
+#: templates/alsijil/print/full_register.html:229
 msgid "Contact details"
 msgstr "Kontaktdetails"
-#: templates/alsijil/print/full_register.html:174
+#: templates/alsijil/print/full_register.html:266
-msgid "Statistics on remarks"
-msgstr "Statistiken zu Bemerkungen"
-#: templates/alsijil/print/full_register.html:179
-msgid "Count"
-msgstr "Anzahl"
-#: templates/alsijil/print/full_register.html:196
 msgid "Absences and tardiness"
 msgstr "Abwesenheiten und Verspätungen"
-#: templates/alsijil/print/full_register.html:215
+#: templates/alsijil/print/full_register.html:269
+msgid "Absences"
+msgstr "Absenzen"
+#: templates/alsijil/print/full_register.html:274
+msgid "thereof"
+msgstr "davon"
+#: templates/alsijil/print/full_register.html:304
 msgid "Relevant personal notes"
 msgstr "Relevante persönliche Notizen"
-#: templates/alsijil/print/full_register.html:219
+#: templates/alsijil/print/full_register.html:308
 msgid "Date"
 msgstr "Datum"
-#: templates/alsijil/print/full_register.html:220
+#: templates/alsijil/print/full_register.html:309
-#: templates/alsijil/print/full_register.html:268
+#: templates/alsijil/print/full_register.html:369
 msgid "Pe."
 msgstr "Std."
-#: templates/alsijil/print/full_register.html:221
+#: templates/alsijil/print/full_register.html:310
-#: templates/alsijil/print/full_register.html:269
+#: templates/alsijil/print/full_register.html:370
 msgid "Subj."
 msgstr "Fa."
-#: templates/alsijil/print/full_register.html:222
+#: templates/alsijil/print/full_register.html:311
-#: templates/alsijil/print/full_register.html:274
+#: templates/alsijil/print/full_register.html:374
 msgid "Te."
 msgstr "Lk."
-#: templates/alsijil/print/full_register.html:240
+#: templates/alsijil/print/full_register.html:313
+msgid "Tard."
+msgstr "Verspät."
+#: templates/alsijil/print/full_register.html:330
 msgid "Yes"
 msgstr "Ja"
-#: templates/alsijil/print/full_register.html:242
+#: templates/alsijil/print/full_register.html:335
-#: templates/alsijil/print/full_register.html:314
+#: templates/alsijil/print/full_register.html:424
-#: templates/alsijil/print/full_register.html:324
+#: templates/alsijil/print/full_register.html:439
 msgid "e"
 msgstr "e"
-#: templates/alsijil/print/full_register.html:262
+#: templates/alsijil/print/full_register.html:363
-msgid "Lesson documentation for calendar week"
+msgid "Lesson documentation for week"
-msgstr "Unterrichtsdokumentation für Kalenderwoche"
+msgstr "Unterrichtsdokumentation für Woche"
-#: templates/alsijil/print/full_register.html:270
-msgid "Subs."
-msgstr "Vertr."
-#: templates/alsijil/print/full_register.html:273
+#: templates/alsijil/print/full_register.html:373
 msgid "Notes"
 msgstr "Notizen"
-#: templates/alsijil/print/full_register.html:301
+#: views.py:76
-msgid "Lesson cancelled"
+msgid "You either selected an invalid lesson or there is currently no lesson in progress."
-msgstr "Stunde ist ausgefallen"
+msgstr ""
+"Sie haben eine ungültige Stunde ausgewählt oder es\n"
+"      läuft momentan keine Stunde."
-#: templates/alsijil/register_absence.html:5
+#: views.py:90
-#: templates/alsijil/register_absence.html:6
+msgid "You are not allowed to create a lesson documentation for a lesson in the future."
-msgid "Manage absence"
+msgstr "Ihnen ist es nicht erlaubt, eine Eintragung für eine Unterrichtsstunde in der Zukunft vorzunehmen."
-msgstr "Abwesenheiten verwalten"
-#: templates/alsijil/week_view.html:6
+#: views.py:116
-#, fuzzy
+msgid "The lesson documentation has been saved."
-#| msgid "Week"
+msgstr "Die Stunden-Dokumentation wurde gespeichert."
-msgid "Week view"
-msgstr "Woche"
-#: templates/alsijil/week_view.html:21
+#: views.py:136
-msgid "Select"
+msgid "The personal notes have been saved."
-msgstr "Auswählen"
+msgstr "Die persönlichen Notizen wurden gespeichert."
-#: templates/alsijil/week_view.html:47
+#: views.py:327
-msgid "Period"
+msgid "There is no current school term."
-msgstr "Stunde"
+msgstr "Es gibt aktuell kein Schuljahr."
-#: templates/alsijil/week_view.html:49
+#: views.py:463
-msgid "Teachers"
+msgid "The absence has been saved."
-msgstr "Lehrkräfte"
+msgstr "Die Abwesenheit wurde gespeichert."
-#: templates/alsijil/week_view.html:97
+#: views.py:488
-msgid "unexcused"
+msgid "The extra mark has been created."
-msgstr "unentschuldigt"
+msgstr "Die zusätzliche Markierung wurde erstellt."
-#: templates/alsijil/week_view.html:100
+#: views.py:499
-msgid "Summed up tardiness"
+msgid "The extra mark has been saved."
-msgstr "Summierte Verspätung"
+msgstr "Die zusätzliche Markierung wurde gespeichert."
-#: templates/alsijil/week_view.html:122
+#: views.py:509
-msgid "No group selected"
+msgid "The extra mark has been deleted."
-msgstr "Keine Gruppe ausgewählt"
+msgstr "Die zusätzliche Markierung wurde gelöscht."
-#: templates/alsijil/week_view.html:125
+#: views.py:529
-msgid ""
+msgid "The excuse type has been created."
-"\n"
+msgstr "Die Entschuldigungsart wurde erstellt."
-"            There are no lessons for the selected group, teacher, room or "
-"time.\n"
-"          "
-msgstr ""
-"\n"
-"            Es gibt keine Stunden für die ausgewählte Gruppe, den Lehrer "
-"oder Raum.\n"
-"          "
-#: views.py:56
+#: views.py:540
-msgid ""
+msgid "The excuse type has been saved."
-"You either selected an invalid lesson or there is currently no lesson in "
+msgstr "Die Entschuldigunsart wurde gespeichert."
-"progress."
-msgstr ""
-"Sie haben eine ungültige Stunde ausgewählt oder es\n"
-"      läuft momentan keine Stunde."
-#: views.py:68
+#: views.py:550
-msgid ""
+msgid "The excuse type has been deleted."
-"You are not allowed to create a lesson documentation for a lesson in the "
+msgstr "Die Entschuldigungsart wurde gelöscht."
-"future."
-msgstr ""
-"Ihnen ist es nicht erlaubt, eine Eintragung für eine Unterrichtsstunde in "
-"der Zukunft vorzunehmen."
-#: views.py:306
+#~ msgid "Personal note filters"
-msgid "The absence has been saved."
+#~ msgstr "Filter für persönliche Notizen"
-msgstr "Die Abwesenheit wurde gespeichert."
+#~ msgid "Identifier"
+#~ msgstr "Kennung"
+#~ msgid "Description"
+#~ msgstr "Beschreibung"
+#~ msgid "Match expression"
+#~ msgstr "Suchausdruck"
+#~ msgid "Personal note filter"
+#~ msgstr "Filter für persönliche Notizen"
+#~ msgid "All personal note filters"
+#~ msgstr "Alle Filter für persönliche Notizen"
+#~ msgid "Add filter"
+#~ msgstr "Filter hinzufügen"
+#~ msgid "Update personal note filter"
+#~ msgstr "Filter für persönliche Notizen aktualisieren"
+#~ msgid "Create personal note filter"
+#~ msgstr "Filter für persönliche Notizen erstellen"
+#~ msgid "Delete filter"
+#~ msgstr "Filter löschen"
+#~ msgid "Statistics on remarks"
+#~ msgstr "Statistiken zu Bemerkungen"
+#~ msgid "Count"
+#~ msgstr "Anzahl"
+#~ msgid "Room"
+#~ msgstr "Raum"
+#~ msgid "List of all personal note filters"
+#~ msgstr "Liste aller Filter für persönliche Notizen"
-#: views.py:344
+#~ msgid "Subs."
-msgid "The filter has been saved"
+#~ msgstr "Vertr."
-msgstr "Der Filter wurde gespeichert"
-#: views.py:360
+#~ msgid "No group selected"
-msgid "The filter has been deleted."
+#~ msgstr "Keine Gruppe ausgewählt"
-msgstr "Der Filter wurde gespeichert."
 #~ msgid "Save"
 #~ msgstr "Speichern"

--- a/aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po
@@ -3,380 +3,649 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-01 13:20+0200\n"
+"POT-Creation-Date: 2020-08-03 20:03+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2020-07-26 14:08+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Marlene Grundey <grundema@katharineum.de>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: French <https://translate.edugit.org/projects/aleksis/aleksis-app-alsijil/fr/>\n"
-"Language: \n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.0.1\n"
-#: forms.py:41
+#: forms.py:25
-msgid "Group"
+msgid "Homework for the next lesson"
 msgstr ""
-#: forms.py:49 templates/alsijil/print/full_register.html:101
+#: forms.py:50 templates/alsijil/print/full_register.html:199
+msgid "Group"
+msgstr "Groupe"
+#: forms.py:56 templates/alsijil/print/full_register.html:170
+#: templates/alsijil/print/full_register.html:201
 msgid "Teacher"
-msgstr ""
+msgstr "Profs"
-#: forms.py:57
+#: forms.py:73
-msgid "Room"
+msgid "You can't select a group and a teacher both."
 msgstr ""
-#: forms.py:70
+#: forms.py:101
 msgid "Start date"
-msgstr ""
+msgstr "Date de début"
-#: forms.py:73
+#: forms.py:102
 msgid "End date"
-msgstr ""
+msgstr "Date de fin"
-#: forms.py:75
+#: forms.py:103
 msgid "From period"
-msgstr ""
+msgstr "De la période"
-#: forms.py:77 templates/alsijil/lesson.html:58
+#: forms.py:105 templates/alsijil/class_register/lesson.html:163
 msgid "Person"
-msgstr ""
+msgstr "Personne"
-#: forms.py:79 templates/alsijil/lesson.html:59
+#: forms.py:107 templates/alsijil/class_register/lesson.html:164
-#: templates/alsijil/print/full_register.html:223
+#: templates/alsijil/class_register/week_view.html:109
-#: templates/alsijil/week_view.html:96
+#: templates/alsijil/print/full_register.html:75
+#: templates/alsijil/print/full_register.html:312
 msgid "Absent"
-msgstr ""
+msgstr "Absent(e)"
-#: forms.py:80 templates/alsijil/lesson.html:61
+#: forms.py:108 templates/alsijil/class_register/lesson.html:166
+#: templates/alsijil/print/full_register.html:84
+#: templates/alsijil/print/full_register.html:275
 msgid "Excused"
-msgstr ""
+msgstr "Excusé"
-#: forms.py:81 templates/alsijil/lesson.html:62
+#: forms.py:109 templates/alsijil/class_register/lesson.html:170
-#: templates/alsijil/print/full_register.html:225
+#: templates/alsijil/class_register/lesson.html:223
+#: templates/alsijil/class_register/lesson.html:231
+#: templates/alsijil/print/full_register.html:314
 msgid "Remarks"
-msgstr ""
+msgstr "Remarque"
-#: menus.py:6 templates/alsijil/print/full_register.html:16
+#: menus.py:6 preferences.py:8 templates/alsijil/print/full_register.html:16
 msgid "Class register"
-msgstr ""
+msgstr "Registre de la classe"
 #: menus.py:16
 msgid "Current lesson"
-msgstr ""
+msgstr "Lecon actuelle"
 #: menus.py:22
 msgid "Current week"
-msgstr ""
+msgstr "Semaine actuelle"
 #: menus.py:28
 msgid "Register absence"
+msgstr "Registre de Absence"
+#: menus.py:34 models.py:32 templates/alsijil/excuse_type/list.html:8
+#: templates/alsijil/excuse_type/list.html:9
+#, fuzzy
+#| msgid "Excused"
+msgid "Excuse types"
+msgstr "Excusé"
+#: menus.py:40 models.py:66 models.py:138
+#: templates/alsijil/class_register/lesson.html:168
+#: templates/alsijil/extra_mark/list.html:8
+#: templates/alsijil/extra_mark/list.html:9
+#: templates/alsijil/print/full_register.html:293
+msgid "Extra marks"
 msgstr ""
-#: menus.py:34
+#: models.py:18 models.py:124
-msgid "Personal note filters"
+#, fuzzy
+#| msgid "First name"
+msgid "Short name"
+msgstr "Prénom"
+#: models.py:20 models.py:126
+msgid "Name"
 msgstr ""
-#: models.py:51 templates/alsijil/print/full_register.html:271
+#: models.py:31 models.py:60 templates/alsijil/class_register/lesson.html:167
+#: templates/alsijil/class_register/lesson.html:202
+#, fuzzy
+#| msgid "Excused"
+msgid "Excuse type"
+msgstr "Excusé"
+#: models.py:75
+#, fuzzy
+#| msgid "Personal notes"
+msgid "Personal note"
+msgstr "Notes personnelles"
+#: models.py:76 templates/alsijil/class_register/lesson.html:64
+#: templates/alsijil/class_register/lesson.html:156
+#: templates/alsijil/class_register/week_view.html:104
+msgid "Personal notes"
+msgstr "Notes personnelles"
+#: models.py:99 templates/alsijil/class_register/week_view.html:56
+#: templates/alsijil/print/full_register.html:371
 msgid "Lesson topic"
-msgstr ""
+msgstr "Sujet de cours"
-#: models.py:52 templates/alsijil/print/full_register.html:272
+#: models.py:100 templates/alsijil/print/full_register.html:372
 msgid "Homework"
-msgstr ""
+msgstr "Devoirs"
-#: models.py:68
+#: models.py:102
-msgid "Identifier"
+#, fuzzy
-msgstr ""
+#| msgid "Group"
+msgid "Group note"
+msgstr "Groupe"
-#: models.py:71 templates/alsijil/print/full_register.html:178
+#: models.py:106 templates/alsijil/class_register/lesson.html:60
-msgid "Description"
+#: templates/alsijil/class_register/lesson.html:143
+msgid "Lesson documentation"
+msgstr "Documentation de cours"
+#: models.py:107
+#, fuzzy
+#| msgid "Lesson documentation"
+msgid "Lesson documentations"
+msgstr "Documentation de cours"
+#: models.py:137
+msgid "Extra mark"
 msgstr ""
-#: models.py:74
+#: preferences.py:16
-msgid "Match expression"
+msgid "Block adding personal notes for cancelled lessons"
 msgstr ""
-#: tables.py:14
+#: tables.py:16 tables.py:36
 msgid "Edit"
 msgstr ""
-#: templates/alsijil/lesson.html:5
+#: tables.py:22 tables.py:42
-msgid "Lesson"
+msgid "Delete"
 msgstr ""
-#: templates/alsijil/lesson.html:34
+#: templates/alsijil/absences/register.html:5
-msgid "Lesson documentation"
+#: templates/alsijil/absences/register.html:6
+msgid "Manage absence"
 msgstr ""
-#: templates/alsijil/lesson.html:43
+#: templates/alsijil/class_register/lesson.html:6
+msgid "Lesson"
+msgstr "Cours"
+#: templates/alsijil/class_register/lesson.html:14
+#: templates/alsijil/class_register/lesson.html:83
+#, fuzzy, python-format
+#| msgid "From period"
+msgid "%(period)s. period"
+msgstr "De la période"
+#: templates/alsijil/class_register/lesson.html:38
+#, fuzzy
+#| msgid "Current lesson"
+msgid "Previous lesson"
+msgstr "Lecon actuelle"
+#: templates/alsijil/class_register/lesson.html:46
+#, fuzzy
+#| msgid "Current lesson"
+msgid "Next lesson"
+msgstr "Lecon actuelle"
+#: templates/alsijil/class_register/lesson.html:68
+#: templates/alsijil/class_register/lesson.html:249
 msgid "Change history"
-msgstr ""
+msgstr "Changement d' histoire"
-#: templates/alsijil/lesson.html:52 templates/alsijil/week_view.html:91
+#: templates/alsijil/class_register/lesson.html:82
-msgid "Personal notes"
+msgid "Overview: Previous lesson"
 msgstr ""
-#: templates/alsijil/lesson.html:60
+#: templates/alsijil/class_register/lesson.html:89
-#: templates/alsijil/print/full_register.html:202
+msgid "Lesson topic of previous lesson:"
-msgid "Tardiness"
 msgstr ""
-#: templates/alsijil/manage_personal_note_filter.html:5
+#: templates/alsijil/class_register/lesson.html:96
-#: templates/alsijil/manage_personal_note_filter.html:6
+msgid "Homework for this lesson:"
-msgid "Manage personal note filter"
 msgstr ""
-#: templates/alsijil/manage_personal_note_filter.html:11
+#: templates/alsijil/class_register/lesson.html:103
-msgid "Delete filter"
+msgid "Group notes for previous lesson:"
 msgstr ""
-#: templates/alsijil/personal_note_filters.html:7
+#: templates/alsijil/class_register/lesson.html:110
-#: templates/alsijil/personal_note_filters.html:8
+#, fuzzy
-msgid "List of all personal note filters"
+#| msgid "Absences"
-msgstr ""
+msgid "Absent persons:"
+msgstr "Absences"
-#: templates/alsijil/personal_note_filters.html:12
+#: templates/alsijil/class_register/lesson.html:117
-msgid "Add filter"
+msgid "Late persons:"
 msgstr ""
-#: templates/alsijil/print/full_register.html:22
+#: templates/alsijil/class_register/lesson.html:165
-#: templates/alsijil/print/full_register.html:54
+#: templates/alsijil/print/full_register.html:287
-msgid "Owners"
+msgid "Tardiness"
+msgstr "Retard"
+#: templates/alsijil/class_register/lesson.html:188
+#, fuzzy
+#| msgid "Tardiness"
+msgid "Tardiness (in m)"
+msgstr "Retard"
+#: templates/alsijil/class_register/week_view.html:6
+msgid "Week view"
+msgstr "Vue de semaine"
+#: templates/alsijil/class_register/week_view.html:27
+msgid "Select"
+msgstr "Sélectionner"
+#: templates/alsijil/class_register/week_view.html:33
+#, python-format
+msgid "CW %(week)s: %(instance)s"
 msgstr ""
-#: templates/alsijil/print/full_register.html:26
+#: templates/alsijil/class_register/week_view.html:50
-msgid "Printed on"
+msgid "Period"
+msgstr "Période"
+#: templates/alsijil/class_register/week_view.html:52
+#, fuzzy
+#| msgid "Group"
+msgid "Groups"
+msgstr "Groupe"
+#: templates/alsijil/class_register/week_view.html:54
+#: templates/alsijil/print/full_register.html:169
+#: templates/alsijil/print/full_register.html:200
+msgid "Subject"
+msgstr "Sujet"
+#: templates/alsijil/class_register/week_view.html:55
+msgid "Teachers"
+msgstr "Profs"
+#: templates/alsijil/class_register/week_view.html:110
+msgid "unexcused"
+msgstr "Injustifié(e)"
+#: templates/alsijil/class_register/week_view.html:113
+msgid "Summed up tardiness"
+msgstr "Résumé des retards"
+#: templates/alsijil/class_register/week_view.html:142
+msgid "No lessons available"
 msgstr ""
-#: templates/alsijil/print/full_register.html:34
+#: templates/alsijil/class_register/week_view.html:145
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "            There are no lessons for the selected group, teacher, room or time.\n"
+#| "          "
 msgid ""
 "\n"
-"            This printout is intended for archival purposes. The main copy "
+"            There are no lessons for the selected group or teacher in this week.\n"
-"of\n"
-"            the class register is stored in the AlekSIS School Information\n"
-"            System.\n"
 "          "
 msgstr ""
-#: templates/alsijil/print/full_register.html:41
-msgid ""
 "\n"
-"            Copies of the class register, both digital and as printout, "
+"            Il n' y a pas des cours pour le groupe sélectionné, les profs, le salle ou le temps.\n"
-"must\n"
-"            only be kept inside the school and/or on devices authorised by "
-"the\n"
-"            school.\n"
 "          "
+#: templates/alsijil/excuse_type/create.html:6
+#: templates/alsijil/excuse_type/create.html:7
+#: templates/alsijil/excuse_type/list.html:16
+msgid "Create excuse type"
+msgstr ""
+#: templates/alsijil/excuse_type/edit.html:6
+#: templates/alsijil/excuse_type/edit.html:7
+msgid "Edit excuse type"
 msgstr ""
-#: templates/alsijil/print/full_register.html:48
+#: templates/alsijil/excuse_type/warning.html:5
 msgid ""
 "\n"
-"            The owner of the group and the headteacher confirm the above, "
+"      This function should only be used to define alternatives to the default excuse which also will be counted extra.\n"
-"as\n"
+"      Don't use this to create a default excuse or if you don't divide between different types of excuse.\n"
-"            well as the correctness of this printout.\n"
+"    "
-"          "
 msgstr ""
-#: templates/alsijil/print/full_register.html:55
+#: templates/alsijil/extra_mark/create.html:6
-msgid "Headteacher"
+#: templates/alsijil/extra_mark/create.html:7
+#: templates/alsijil/extra_mark/list.html:14
+msgid "Create extra mark"
 msgstr ""
-#: templates/alsijil/print/full_register.html:61
+#: templates/alsijil/extra_mark/edit.html:6
-msgid "Persons in group"
+#: templates/alsijil/extra_mark/edit.html:7
+msgid "Edit extra mark"
 msgstr ""
-#: templates/alsijil/print/full_register.html:66
+#: templates/alsijil/partials/absences.html:4
-msgid "No."
+#: templates/alsijil/print/full_register.html:126
+msgid "(e)"
 msgstr ""
-#: templates/alsijil/print/full_register.html:67
+#: templates/alsijil/partials/absences.html:4
-msgid "Last name"
+#: templates/alsijil/print/full_register.html:130
+msgid "(u)"
 msgstr ""
-#: templates/alsijil/print/full_register.html:68
+#: templates/alsijil/partials/lesson_status_icon.html:6
-msgid "First name"
+msgid "Data complete"
 msgstr ""
-#: templates/alsijil/print/full_register.html:69
+#: templates/alsijil/partials/lesson_status_icon.html:12
-msgid "Sex"
+#: templates/alsijil/print/full_register.html:406
-msgstr ""
+msgid "Lesson cancelled"
+msgstr "Cours annulés"
-#: templates/alsijil/print/full_register.html:70
+#: templates/alsijil/partials/lesson_status_icon.html:14
-msgid "Date of birth"
+msgid "Missing data"
 msgstr ""
-#: templates/alsijil/print/full_register.html:71
+#: templates/alsijil/partials/lesson_status_icon.html:16
-#: templates/alsijil/print/full_register.html:200
+msgid "Pending"
-msgid "Absences"
 msgstr ""
-#: templates/alsijil/print/full_register.html:72
+#: templates/alsijil/partials/lesson_status_icon.html:18
-#: templates/alsijil/print/full_register.html:201
+msgid "Substitution"
-msgid "Unexcused"
 msgstr ""
-#: templates/alsijil/print/full_register.html:73
+#: templates/alsijil/print/full_register.html:6
-#: templates/alsijil/print/full_register.html:224
+#, fuzzy
-msgid "Tard."
+#| msgid "Class register"
+msgid "Class register:"
+msgstr "Registre de la classe"
+#: templates/alsijil/print/full_register.html:26
+#: templates/alsijil/print/full_register.html:59
+msgid "Owners"
+msgstr "Propriétaires"
+#: templates/alsijil/print/full_register.html:30
+msgid "Printed on"
+msgstr "Imprimé sur"
+#: templates/alsijil/print/full_register.html:38
+msgid ""
+"\n"
+"        This printout is intended for archival purposes. The main copy of\n"
+"        the class register is stored in the AlekSIS School Information\n"
+"        System.\n"
+"      "
 msgstr ""
-#: templates/alsijil/print/full_register.html:95
+#: templates/alsijil/print/full_register.html:45
-msgid "Teachers and lessons in group"
+msgid ""
+"\n"
+"        Copies of the class register, both digital and as printout, must\n"
+"        only be kept inside the school and/or on devices authorised by the\n"
+"        school.\n"
+"      "
 msgstr ""
-#: templates/alsijil/print/full_register.html:100
+#: templates/alsijil/print/full_register.html:52
-#: templates/alsijil/week_view.html:48
+msgid ""
-msgid "Subject"
+"\n"
+"        The owner of the group and the headteacher confirm the above, as\n"
+"        well as the correctness of this printout.\n"
+"      "
 msgstr ""
-#: templates/alsijil/print/full_register.html:102
+#: templates/alsijil/print/full_register.html:62
-msgid "Lesson start"
+msgid "Headteacher"
+msgstr "Prof principale"
+#: templates/alsijil/print/full_register.html:69
+msgid "Abbreviations"
 msgstr ""
-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:71
-msgid "Lesson end"
+msgid "General"
 msgstr ""
-#: templates/alsijil/print/full_register.html:104
+#: templates/alsijil/print/full_register.html:78
-msgid "Per week"
+msgid "Late"
 msgstr ""
-#: templates/alsijil/print/full_register.html:124
+#: templates/alsijil/print/full_register.html:81
-msgid "Personal overview"
+#: templates/alsijil/print/full_register.html:283
+msgid "Unexcused"
+msgstr "injustifié(e)"
+#: templates/alsijil/print/full_register.html:89
+msgid "Custom excuse types"
 msgstr ""
-#: templates/alsijil/print/full_register.html:126
+#: templates/alsijil/print/full_register.html:101
-msgid "Contact details"
+msgid "Available extra marks"
 msgstr ""
-#: templates/alsijil/print/full_register.html:174
+#: templates/alsijil/print/full_register.html:115
-msgid "Statistics on remarks"
+msgid "Persons in group"
+msgstr "Personnes en groupe"
+#: templates/alsijil/print/full_register.html:120
+msgid "No."
+msgstr "Non."
+#: templates/alsijil/print/full_register.html:121
+msgid "Last name"
+msgstr "Nom de famille"
+#: templates/alsijil/print/full_register.html:122
+msgid "First name"
+msgstr "Prénom"
+#: templates/alsijil/print/full_register.html:123
+msgid "Sex"
+msgstr "Sexe"
+#: templates/alsijil/print/full_register.html:124
+msgid "Date of birth"
+msgstr "Date d'anniversaire"
+#: templates/alsijil/print/full_register.html:125
+msgid "(a)"
 msgstr ""
-#: templates/alsijil/print/full_register.html:179
+#: templates/alsijil/print/full_register.html:131
-msgid "Count"
+msgid "(b)"
 msgstr ""
-#: templates/alsijil/print/full_register.html:196
+#: templates/alsijil/print/full_register.html:164
+msgid "Teachers and lessons in group"
+msgstr "Profs et cours en groupe"
+#: templates/alsijil/print/full_register.html:171
+#: templates/alsijil/print/full_register.html:202
+msgid "Lesson start"
+msgstr "Début de cours"
+#: templates/alsijil/print/full_register.html:172
+#: templates/alsijil/print/full_register.html:203
+msgid "Lesson end"
+msgstr "Fin de cours"
+#: templates/alsijil/print/full_register.html:173
+#: templates/alsijil/print/full_register.html:204
+msgid "Per week"
+msgstr "Par semaine"
+#: templates/alsijil/print/full_register.html:194
+#, fuzzy
+#| msgid "Teachers and lessons in group"
+msgid "Teachers and lessons in child groups"
+msgstr "Profs et cours en groupe"
+#: templates/alsijil/print/full_register.html:227
+msgid "Personal overview"
+msgstr "Vue d'ensemble personnelle"
+#: templates/alsijil/print/full_register.html:229
+msgid "Contact details"
+msgstr "Détails de contact"
+#: templates/alsijil/print/full_register.html:266
 msgid "Absences and tardiness"
+msgstr "Absences et retards"
+#: templates/alsijil/print/full_register.html:269
+msgid "Absences"
+msgstr "Absences"
+#: templates/alsijil/print/full_register.html:274
+msgid "thereof"
 msgstr ""
-#: templates/alsijil/print/full_register.html:215
+#: templates/alsijil/print/full_register.html:304
 msgid "Relevant personal notes"
-msgstr ""
+msgstr "Notes personnelles importantes"
-#: templates/alsijil/print/full_register.html:219
+#: templates/alsijil/print/full_register.html:308
 msgid "Date"
-msgstr ""
+msgstr "Date"
-#: templates/alsijil/print/full_register.html:220
+#: templates/alsijil/print/full_register.html:309
-#: templates/alsijil/print/full_register.html:268
+#: templates/alsijil/print/full_register.html:369
 msgid "Pe."
 msgstr ""
-#: templates/alsijil/print/full_register.html:221
+#: templates/alsijil/print/full_register.html:310
-#: templates/alsijil/print/full_register.html:269
+#: templates/alsijil/print/full_register.html:370
 msgid "Subj."
 msgstr ""
-#: templates/alsijil/print/full_register.html:222
+#: templates/alsijil/print/full_register.html:311
-#: templates/alsijil/print/full_register.html:274
+#: templates/alsijil/print/full_register.html:374
 msgid "Te."
 msgstr ""
-#: templates/alsijil/print/full_register.html:240
+#: templates/alsijil/print/full_register.html:313
-msgid "Yes"
+msgid "Tard."
 msgstr ""
-#: templates/alsijil/print/full_register.html:242
+#: templates/alsijil/print/full_register.html:330
-#: templates/alsijil/print/full_register.html:314
+msgid "Yes"
-#: templates/alsijil/print/full_register.html:324
+msgstr "Oui"
-msgid "e"
-msgstr ""
-#: templates/alsijil/print/full_register.html:262
+#: templates/alsijil/print/full_register.html:335
-msgid "Lesson documentation for calendar week"
+#: templates/alsijil/print/full_register.html:424
-msgstr ""
+#: templates/alsijil/print/full_register.html:439
+msgid "e"
+msgstr "e"
-#: templates/alsijil/print/full_register.html:270
+#: templates/alsijil/print/full_register.html:363
-msgid "Subs."
+#, fuzzy
-msgstr ""
+#| msgid "Lesson documentation for calendar week"
+msgid "Lesson documentation for week"
+msgstr "Documentation de cours pour la semaine calendrier"
-#: templates/alsijil/print/full_register.html:273
+#: templates/alsijil/print/full_register.html:373
 msgid "Notes"
-msgstr ""
+msgstr "Notes"
-#: templates/alsijil/print/full_register.html:301
+#: views.py:76
-msgid "Lesson cancelled"
+msgid "You either selected an invalid lesson or there is currently no lesson in progress."
 msgstr ""
-#: templates/alsijil/register_absence.html:5
+#: views.py:90
-#: templates/alsijil/register_absence.html:6
+msgid "You are not allowed to create a lesson documentation for a lesson in the future."
-msgid "Manage absence"
 msgstr ""
-#: templates/alsijil/week_view.html:6
+#: views.py:116
-msgid "Week view"
+#, fuzzy
-msgstr ""
+#| msgid "Lesson documentation for calendar week"
+msgid "The lesson documentation has been saved."
+msgstr "Documentation de cours pour la semaine calendrier"
-#: templates/alsijil/week_view.html:21
+#: views.py:136
-msgid "Select"
+msgid "The personal notes have been saved."
 msgstr ""
-#: templates/alsijil/week_view.html:47
+#: views.py:327
-msgid "Period"
+msgid "There is no current school term."
 msgstr ""
-#: templates/alsijil/week_view.html:49
+#: views.py:463
-msgid "Teachers"
+msgid "The absence has been saved."
 msgstr ""
-#: templates/alsijil/week_view.html:97
+#: views.py:488
-msgid "unexcused"
+#, fuzzy
-msgstr ""
+#| msgid "Lesson documentation for calendar week"
+msgid "The extra mark has been created."
+msgstr "Documentation de cours pour la semaine calendrier"
-#: templates/alsijil/week_view.html:100
+#: views.py:499
-msgid "Summed up tardiness"
+#, fuzzy
-msgstr ""
+#| msgid "Lesson documentation for calendar week"
+msgid "The extra mark has been saved."
+msgstr "Documentation de cours pour la semaine calendrier"
-#: templates/alsijil/week_view.html:122
+#: views.py:509
-msgid "No group selected"
+msgid "The extra mark has been deleted."
 msgstr ""
-#: templates/alsijil/week_view.html:125
+#: views.py:529
-msgid ""
+msgid "The excuse type has been created."
-"\n"
-"            There are no lessons for the selected group, teacher, room or "
-"time.\n"
-"          "
 msgstr ""
-#: views.py:56
+#: views.py:540
-msgid ""
+msgid "The excuse type has been saved."
-"You either selected an invalid lesson or there is currently no lesson in "
-"progress."
 msgstr ""
-#: views.py:68
+#: views.py:550
-msgid ""
+msgid "The excuse type has been deleted."
-"You are not allowed to create a lesson documentation for a lesson in the "
-"future."
 msgstr ""
-#: views.py:306
+#~ msgid "Personal note filters"
-msgid "The absence has been saved."
+#~ msgstr "Filtres de notes personnelles"
-msgstr ""
-#: views.py:344
+#~ msgid "Identifier"
-msgid "The filter has been saved"
+#~ msgstr "Identificateur"
-msgstr ""
-#: views.py:360
+#~ msgid "Description"
-msgid "The filter has been deleted."
+#~ msgstr "Description"
-msgstr ""
+#, fuzzy
+#~| msgid "Personal note filters"
+#~ msgid "Personal note filter"
+#~ msgstr "Filtres de notes personnelles"
+#, fuzzy
+#~| msgid "Personal note filters"
+#~ msgid "All personal note filters"
+#~ msgstr "Filtres de notes personnelles"
+#, fuzzy
+#~| msgid "Personal note filters"
+#~ msgid "Update personal note filter"
+#~ msgstr "Filtres de notes personnelles"
+#, fuzzy
+#~| msgid "Personal note filters"
+#~ msgid "Create personal note filter"
+#~ msgstr "Filtres de notes personnelles"
+#~ msgid "Count"
+#~ msgstr "Compter"
+#~ msgid "Room"
+#~ msgstr "Salle"
+#~ msgid "List of all personal note filters"
+#~ msgstr "Liste de filtres de notes personnelles"
--- a/aleksis/apps/alsijil/locale/la/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/la/LC_MESSAGES/django.po
@@ -3,64 +3,75 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-01 13:20+0200\n"
+"POT-Creation-Date: 2020-08-03 20:03+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2020-07-26 14:08+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Julian <leuckerj@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Latin <https://translate.edugit.org/projects/aleksis/aleksis-app-alsijil/la/>\n"
-"Language: \n"
+"Language: la\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.0.1\n"
-#: forms.py:41
+#: forms.py:25
-msgid "Group"
+msgid "Homework for the next lesson"
 msgstr ""
-#: forms.py:49 templates/alsijil/print/full_register.html:101
+#: forms.py:50 templates/alsijil/print/full_register.html:199
+msgid "Group"
+msgstr "Grex"
+#: forms.py:56 templates/alsijil/print/full_register.html:170
+#: templates/alsijil/print/full_register.html:201
 msgid "Teacher"
 msgstr ""
-#: forms.py:57
+#: forms.py:73
-msgid "Room"
+msgid "You can't select a group and a teacher both."
 msgstr ""
-#: forms.py:70
+#: forms.py:101
 msgid "Start date"
 msgstr ""
-#: forms.py:73
+#: forms.py:102
 msgid "End date"
 msgstr ""
-#: forms.py:75
+#: forms.py:103
 msgid "From period"
 msgstr ""
-#: forms.py:77 templates/alsijil/lesson.html:58
+#: forms.py:105 templates/alsijil/class_register/lesson.html:163
 msgid "Person"
-msgstr ""
+msgstr "Persona"
-#: forms.py:79 templates/alsijil/lesson.html:59
+#: forms.py:107 templates/alsijil/class_register/lesson.html:164
-#: templates/alsijil/print/full_register.html:223
+#: templates/alsijil/class_register/week_view.html:109
-#: templates/alsijil/week_view.html:96
+#: templates/alsijil/print/full_register.html:75
+#: templates/alsijil/print/full_register.html:312
 msgid "Absent"
 msgstr ""
-#: forms.py:80 templates/alsijil/lesson.html:61
+#: forms.py:108 templates/alsijil/class_register/lesson.html:166
+#: templates/alsijil/print/full_register.html:84
+#: templates/alsijil/print/full_register.html:275
 msgid "Excused"
 msgstr ""
-#: forms.py:81 templates/alsijil/lesson.html:62
+#: forms.py:109 templates/alsijil/class_register/lesson.html:170
-#: templates/alsijil/print/full_register.html:225
+#: templates/alsijil/class_register/lesson.html:223
+#: templates/alsijil/class_register/lesson.html:231
+#: templates/alsijil/print/full_register.html:314
 msgid "Remarks"
 msgstr ""
-#: menus.py:6 templates/alsijil/print/full_register.html:16
+#: menus.py:6 preferences.py:8 templates/alsijil/print/full_register.html:16
 msgid "Class register"
 msgstr ""
@@ -76,306 +87,495 @@ msgstr ""
 msgid "Register absence"
 msgstr ""
-#: menus.py:34
+#: menus.py:34 models.py:32 templates/alsijil/excuse_type/list.html:8
-msgid "Personal note filters"
+#: templates/alsijil/excuse_type/list.html:9
+msgid "Excuse types"
 msgstr ""
-#: models.py:51 templates/alsijil/print/full_register.html:271
+#: menus.py:40 models.py:66 models.py:138
+#: templates/alsijil/class_register/lesson.html:168
+#: templates/alsijil/extra_mark/list.html:8
+#: templates/alsijil/extra_mark/list.html:9
+#: templates/alsijil/print/full_register.html:293
+msgid "Extra marks"
+msgstr ""
+#: models.py:18 models.py:124
+#, fuzzy
+#| msgid "First name"
+msgid "Short name"
+msgstr "Primus nomen"
+#: models.py:20 models.py:126
+msgid "Name"
+msgstr ""
+#: models.py:31 models.py:60 templates/alsijil/class_register/lesson.html:167
+#: templates/alsijil/class_register/lesson.html:202
+msgid "Excuse type"
+msgstr ""
+#: models.py:75
+#, fuzzy
+#| msgid "Person"
+msgid "Personal note"
+msgstr "Persona"
+#: models.py:76 templates/alsijil/class_register/lesson.html:64
+#: templates/alsijil/class_register/lesson.html:156
+#: templates/alsijil/class_register/week_view.html:104
+msgid "Personal notes"
+msgstr ""
+#: models.py:99 templates/alsijil/class_register/week_view.html:56
+#: templates/alsijil/print/full_register.html:371
 msgid "Lesson topic"
 msgstr ""
-#: models.py:52 templates/alsijil/print/full_register.html:272
+#: models.py:100 templates/alsijil/print/full_register.html:372
 msgid "Homework"
 msgstr ""
-#: models.py:68
+#: models.py:102
-msgid "Identifier"
+#, fuzzy
+#| msgid "Group"
+msgid "Group note"
+msgstr "Grex"
+#: models.py:106 templates/alsijil/class_register/lesson.html:60
+#: templates/alsijil/class_register/lesson.html:143
+msgid "Lesson documentation"
+msgstr ""
+#: models.py:107
+msgid "Lesson documentations"
 msgstr ""
-#: models.py:71 templates/alsijil/print/full_register.html:178
+#: models.py:137
-msgid "Description"
+msgid "Extra mark"
 msgstr ""
-#: models.py:74
+#: preferences.py:16
-msgid "Match expression"
+msgid "Block adding personal notes for cancelled lessons"
 msgstr ""
-#: tables.py:14
+#: tables.py:16 tables.py:36
 msgid "Edit"
 msgstr ""
-#: templates/alsijil/lesson.html:5
+#: tables.py:22 tables.py:42
+msgid "Delete"
+msgstr ""
+#: templates/alsijil/absences/register.html:5
+#: templates/alsijil/absences/register.html:6
+msgid "Manage absence"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:6
 msgid "Lesson"
 msgstr ""
-#: templates/alsijil/lesson.html:34
+#: templates/alsijil/class_register/lesson.html:14
-msgid "Lesson documentation"
+#: templates/alsijil/class_register/lesson.html:83
+#, python-format
+msgid "%(period)s. period"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:38
+msgid "Previous lesson"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:46
+msgid "Next lesson"
 msgstr ""
-#: templates/alsijil/lesson.html:43
+#: templates/alsijil/class_register/lesson.html:68
+#: templates/alsijil/class_register/lesson.html:249
 msgid "Change history"
 msgstr ""
-#: templates/alsijil/lesson.html:52 templates/alsijil/week_view.html:91
+#: templates/alsijil/class_register/lesson.html:82
-msgid "Personal notes"
+msgid "Overview: Previous lesson"
 msgstr ""
-#: templates/alsijil/lesson.html:60
+#: templates/alsijil/class_register/lesson.html:89
-#: templates/alsijil/print/full_register.html:202
+msgid "Lesson topic of previous lesson:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:96
+msgid "Homework for this lesson:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:103
+msgid "Group notes for previous lesson:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:110
+msgid "Absent persons:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:117
+msgid "Late persons:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:165
+#: templates/alsijil/print/full_register.html:287
 msgid "Tardiness"
 msgstr ""
-#: templates/alsijil/manage_personal_note_filter.html:5
+#: templates/alsijil/class_register/lesson.html:188
-#: templates/alsijil/manage_personal_note_filter.html:6
+msgid "Tardiness (in m)"
-msgid "Manage personal note filter"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:6
+msgid "Week view"
 msgstr ""
-#: templates/alsijil/manage_personal_note_filter.html:11
+#: templates/alsijil/class_register/week_view.html:27
-msgid "Delete filter"
+msgid "Select"
 msgstr ""
-#: templates/alsijil/personal_note_filters.html:7
+#: templates/alsijil/class_register/week_view.html:33
-#: templates/alsijil/personal_note_filters.html:8
+#, python-format
-msgid "List of all personal note filters"
+msgid "CW %(week)s: %(instance)s"
 msgstr ""
-#: templates/alsijil/personal_note_filters.html:12
+#: templates/alsijil/class_register/week_view.html:50
-msgid "Add filter"
+msgid "Period"
 msgstr ""
-#: templates/alsijil/print/full_register.html:22
+#: templates/alsijil/class_register/week_view.html:52
-#: templates/alsijil/print/full_register.html:54
+#, fuzzy
-msgid "Owners"
+#| msgid "Group"
+msgid "Groups"
+msgstr "Grex"
+#: templates/alsijil/class_register/week_view.html:54
+#: templates/alsijil/print/full_register.html:169
+#: templates/alsijil/print/full_register.html:200
+msgid "Subject"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:55
+msgid "Teachers"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:110
+msgid "unexcused"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:113
+msgid "Summed up tardiness"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:142
+msgid "No lessons available"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:145
+msgid ""
+"\n"
+"            There are no lessons for the selected group or teacher in this week.\n"
+"          "
+msgstr ""
+#: templates/alsijil/excuse_type/create.html:6
+#: templates/alsijil/excuse_type/create.html:7
+#: templates/alsijil/excuse_type/list.html:16
+msgid "Create excuse type"
+msgstr ""
+#: templates/alsijil/excuse_type/edit.html:6
+#: templates/alsijil/excuse_type/edit.html:7
+msgid "Edit excuse type"
+msgstr ""
+#: templates/alsijil/excuse_type/warning.html:5
+msgid ""
+"\n"
+"      This function should only be used to define alternatives to the default excuse which also will be counted extra.\n"
+"      Don't use this to create a default excuse or if you don't divide between different types of excuse.\n"
+"    "
+msgstr ""
+#: templates/alsijil/extra_mark/create.html:6
+#: templates/alsijil/extra_mark/create.html:7
+#: templates/alsijil/extra_mark/list.html:14
+msgid "Create extra mark"
+msgstr ""
+#: templates/alsijil/extra_mark/edit.html:6
+#: templates/alsijil/extra_mark/edit.html:7
+msgid "Edit extra mark"
+msgstr ""
+#: templates/alsijil/partials/absences.html:4
+#: templates/alsijil/print/full_register.html:126
+msgid "(e)"
+msgstr ""
+#: templates/alsijil/partials/absences.html:4
+#: templates/alsijil/print/full_register.html:130
+msgid "(u)"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:6
+msgid "Data complete"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:12
+#: templates/alsijil/print/full_register.html:406
+msgid "Lesson cancelled"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:14
+msgid "Missing data"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:16
+msgid "Pending"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:18
+msgid "Substitution"
+msgstr ""
+#: templates/alsijil/print/full_register.html:6
+msgid "Class register:"
 msgstr ""
 #: templates/alsijil/print/full_register.html:26
+#: templates/alsijil/print/full_register.html:59
+msgid "Owners"
+msgstr ""
+#: templates/alsijil/print/full_register.html:30
 msgid "Printed on"
 msgstr ""
-#: templates/alsijil/print/full_register.html:34
+#: templates/alsijil/print/full_register.html:38
 msgid ""
 "\n"
-"            This printout is intended for archival purposes. The main copy "
+"        This printout is intended for archival purposes. The main copy of\n"
-"of\n"
+"        the class register is stored in the AlekSIS School Information\n"
-"            the class register is stored in the AlekSIS School Information\n"
+"        System.\n"
-"            System.\n"
+"      "
-"          "
 msgstr ""
-#: templates/alsijil/print/full_register.html:41
+#: templates/alsijil/print/full_register.html:45
 msgid ""
 "\n"
-"            Copies of the class register, both digital and as printout, "
+"        Copies of the class register, both digital and as printout, must\n"
-"must\n"
+"        only be kept inside the school and/or on devices authorised by the\n"
-"            only be kept inside the school and/or on devices authorised by "
+"        school.\n"
-"the\n"
+"      "
-"            school.\n"
-"          "
 msgstr ""
-#: templates/alsijil/print/full_register.html:48
+#: templates/alsijil/print/full_register.html:52
 msgid ""
 "\n"
-"            The owner of the group and the headteacher confirm the above, "
+"        The owner of the group and the headteacher confirm the above, as\n"
-"as\n"
+"        well as the correctness of this printout.\n"
-"            well as the correctness of this printout.\n"
+"      "
-"          "
 msgstr ""
-#: templates/alsijil/print/full_register.html:55
+#: templates/alsijil/print/full_register.html:62
 msgid "Headteacher"
 msgstr ""
-#: templates/alsijil/print/full_register.html:61
+#: templates/alsijil/print/full_register.html:69
-msgid "Persons in group"
+msgid "Abbreviations"
 msgstr ""
-#: templates/alsijil/print/full_register.html:66
+#: templates/alsijil/print/full_register.html:71
-msgid "No."
+msgid "General"
 msgstr ""
-#: templates/alsijil/print/full_register.html:67
+#: templates/alsijil/print/full_register.html:78
-msgid "Last name"
+msgid "Late"
 msgstr ""
-#: templates/alsijil/print/full_register.html:68
+#: templates/alsijil/print/full_register.html:81
-msgid "First name"
+#: templates/alsijil/print/full_register.html:283
+msgid "Unexcused"
 msgstr ""
-#: templates/alsijil/print/full_register.html:69
+#: templates/alsijil/print/full_register.html:89
-msgid "Sex"
+msgid "Custom excuse types"
 msgstr ""
-#: templates/alsijil/print/full_register.html:70
+#: templates/alsijil/print/full_register.html:101
-msgid "Date of birth"
+msgid "Available extra marks"
 msgstr ""
-#: templates/alsijil/print/full_register.html:71
+#: templates/alsijil/print/full_register.html:115
-#: templates/alsijil/print/full_register.html:200
+msgid "Persons in group"
-msgid "Absences"
 msgstr ""
-#: templates/alsijil/print/full_register.html:72
+#: templates/alsijil/print/full_register.html:120
-#: templates/alsijil/print/full_register.html:201
+msgid "No."
-msgid "Unexcused"
 msgstr ""
-#: templates/alsijil/print/full_register.html:73
+#: templates/alsijil/print/full_register.html:121
-#: templates/alsijil/print/full_register.html:224
+msgid "Last name"
-msgid "Tard."
+msgstr "Secondus nomen"
+#: templates/alsijil/print/full_register.html:122
+msgid "First name"
+msgstr "Primus nomen"
+#: templates/alsijil/print/full_register.html:123
+msgid "Sex"
+msgstr "Genus"
+#: templates/alsijil/print/full_register.html:124
+msgid "Date of birth"
+msgstr "Dies natalis"
+#: templates/alsijil/print/full_register.html:125
+msgid "(a)"
 msgstr ""
-#: templates/alsijil/print/full_register.html:95
+#: templates/alsijil/print/full_register.html:131
-msgid "Teachers and lessons in group"
+msgid "(b)"
 msgstr ""
-#: templates/alsijil/print/full_register.html:100
+#: templates/alsijil/print/full_register.html:164
-#: templates/alsijil/week_view.html:48
+msgid "Teachers and lessons in group"
-msgid "Subject"
 msgstr ""
-#: templates/alsijil/print/full_register.html:102
+#: templates/alsijil/print/full_register.html:171
+#: templates/alsijil/print/full_register.html:202
 msgid "Lesson start"
 msgstr ""
-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:172
+#: templates/alsijil/print/full_register.html:203
 msgid "Lesson end"
 msgstr ""
-#: templates/alsijil/print/full_register.html:104
+#: templates/alsijil/print/full_register.html:173
+#: templates/alsijil/print/full_register.html:204
 msgid "Per week"
 msgstr ""
-#: templates/alsijil/print/full_register.html:124
+#: templates/alsijil/print/full_register.html:194
+msgid "Teachers and lessons in child groups"
+msgstr ""
+#: templates/alsijil/print/full_register.html:227
 msgid "Personal overview"
 msgstr ""
-#: templates/alsijil/print/full_register.html:126
+#: templates/alsijil/print/full_register.html:229
 msgid "Contact details"
 msgstr ""
-#: templates/alsijil/print/full_register.html:174
+#: templates/alsijil/print/full_register.html:266
-msgid "Statistics on remarks"
+msgid "Absences and tardiness"
 msgstr ""
-#: templates/alsijil/print/full_register.html:179
+#: templates/alsijil/print/full_register.html:269
-msgid "Count"
+msgid "Absences"
 msgstr ""
-#: templates/alsijil/print/full_register.html:196
+#: templates/alsijil/print/full_register.html:274
-msgid "Absences and tardiness"
+msgid "thereof"
 msgstr ""
-#: templates/alsijil/print/full_register.html:215
+#: templates/alsijil/print/full_register.html:304
 msgid "Relevant personal notes"
 msgstr ""
-#: templates/alsijil/print/full_register.html:219
+#: templates/alsijil/print/full_register.html:308
 msgid "Date"
-msgstr ""
+msgstr "dies"
-#: templates/alsijil/print/full_register.html:220
+#: templates/alsijil/print/full_register.html:309
-#: templates/alsijil/print/full_register.html:268
+#: templates/alsijil/print/full_register.html:369
 msgid "Pe."
 msgstr ""
-#: templates/alsijil/print/full_register.html:221
+#: templates/alsijil/print/full_register.html:310
-#: templates/alsijil/print/full_register.html:269
+#: templates/alsijil/print/full_register.html:370
 msgid "Subj."
 msgstr ""
-#: templates/alsijil/print/full_register.html:222
+#: templates/alsijil/print/full_register.html:311
-#: templates/alsijil/print/full_register.html:274
+#: templates/alsijil/print/full_register.html:374
 msgid "Te."
 msgstr ""
-#: templates/alsijil/print/full_register.html:240
+#: templates/alsijil/print/full_register.html:313
-msgid "Yes"
+msgid "Tard."
 msgstr ""
-#: templates/alsijil/print/full_register.html:242
+#: templates/alsijil/print/full_register.html:330
-#: templates/alsijil/print/full_register.html:314
+msgid "Yes"
-#: templates/alsijil/print/full_register.html:324
-msgid "e"
 msgstr ""
-#: templates/alsijil/print/full_register.html:262
+#: templates/alsijil/print/full_register.html:335
-msgid "Lesson documentation for calendar week"
+#: templates/alsijil/print/full_register.html:424
+#: templates/alsijil/print/full_register.html:439
+msgid "e"
 msgstr ""
-#: templates/alsijil/print/full_register.html:270
+#: templates/alsijil/print/full_register.html:363
-msgid "Subs."
+msgid "Lesson documentation for week"
 msgstr ""
-#: templates/alsijil/print/full_register.html:273
+#: templates/alsijil/print/full_register.html:373
 msgid "Notes"
 msgstr ""
-#: templates/alsijil/print/full_register.html:301
+#: views.py:76
-msgid "Lesson cancelled"
+msgid "You either selected an invalid lesson or there is currently no lesson in progress."
 msgstr ""
-#: templates/alsijil/register_absence.html:5
+#: views.py:90
-#: templates/alsijil/register_absence.html:6
+msgid "You are not allowed to create a lesson documentation for a lesson in the future."
-msgid "Manage absence"
 msgstr ""
-#: templates/alsijil/week_view.html:6
+#: views.py:116
-msgid "Week view"
+msgid "The lesson documentation has been saved."
-msgstr ""
-#: templates/alsijil/week_view.html:21
-msgid "Select"
-msgstr ""
-#: templates/alsijil/week_view.html:47
-msgid "Period"
 msgstr ""
-#: templates/alsijil/week_view.html:49
+#: views.py:136
-msgid "Teachers"
+msgid "The personal notes have been saved."
 msgstr ""
-#: templates/alsijil/week_view.html:97
+#: views.py:327
-msgid "unexcused"
+msgid "There is no current school term."
 msgstr ""
-#: templates/alsijil/week_view.html:100
+#: views.py:463
-msgid "Summed up tardiness"
+msgid "The absence has been saved."
 msgstr ""
-#: templates/alsijil/week_view.html:122
+#: views.py:488
-msgid "No group selected"
+msgid "The extra mark has been created."
 msgstr ""
-#: templates/alsijil/week_view.html:125
+#: views.py:499
-msgid ""
+msgid "The extra mark has been saved."
-"\n"
-"            There are no lessons for the selected group, teacher, room or "
-"time.\n"
-"          "
 msgstr ""
-#: views.py:56
+#: views.py:509
-msgid ""
+msgid "The extra mark has been deleted."
-"You either selected an invalid lesson or there is currently no lesson in "
-"progress."
 msgstr ""
-#: views.py:68
+#: views.py:529
-msgid ""
+msgid "The excuse type has been created."
-"You are not allowed to create a lesson documentation for a lesson in the "
-"future."
 msgstr ""
-#: views.py:306
+#: views.py:540
-msgid "The absence has been saved."
+msgid "The excuse type has been saved."
 msgstr ""
-#: views.py:344
+#: views.py:550
-msgid "The filter has been saved"
+msgid "The excuse type has been deleted."
 msgstr ""
-#: views.py:360
+#~ msgid "Description"
-msgid "The filter has been deleted."
+#~ msgstr "Descriptio"
-msgstr ""
--- a/aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-01 13:20+0200\n"
+"POT-Creation-Date: 2020-08-03 20:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,50 +17,60 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-#: forms.py:41
+#: forms.py:25
+msgid "Homework for the next lesson"
+msgstr ""
+#: forms.py:50 templates/alsijil/print/full_register.html:199
 msgid "Group"
 msgstr ""
-#: forms.py:49 templates/alsijil/print/full_register.html:101
+#: forms.py:56 templates/alsijil/print/full_register.html:170
+#: templates/alsijil/print/full_register.html:201
 msgid "Teacher"
 msgstr ""
-#: forms.py:57
+#: forms.py:73
-msgid "Room"
+msgid "You can't select a group and a teacher both."
 msgstr ""
-#: forms.py:70
+#: forms.py:101
 msgid "Start date"
 msgstr ""
-#: forms.py:73
+#: forms.py:102
 msgid "End date"
 msgstr ""
-#: forms.py:75
+#: forms.py:103
 msgid "From period"
 msgstr ""
-#: forms.py:77 templates/alsijil/lesson.html:58
+#: forms.py:105 templates/alsijil/class_register/lesson.html:163
 msgid "Person"
 msgstr ""
-#: forms.py:79 templates/alsijil/lesson.html:59
+#: forms.py:107 templates/alsijil/class_register/lesson.html:164
-#: templates/alsijil/print/full_register.html:223
+#: templates/alsijil/class_register/week_view.html:109
-#: templates/alsijil/week_view.html:96
+#: templates/alsijil/print/full_register.html:75
+#: templates/alsijil/print/full_register.html:312
 msgid "Absent"
 msgstr ""
-#: forms.py:80 templates/alsijil/lesson.html:61
+#: forms.py:108 templates/alsijil/class_register/lesson.html:166
+#: templates/alsijil/print/full_register.html:84
+#: templates/alsijil/print/full_register.html:275
 msgid "Excused"
 msgstr ""
-#: forms.py:81 templates/alsijil/lesson.html:62
+#: forms.py:109 templates/alsijil/class_register/lesson.html:170
-#: templates/alsijil/print/full_register.html:225
+#: templates/alsijil/class_register/lesson.html:223
+#: templates/alsijil/class_register/lesson.html:231
+#: templates/alsijil/print/full_register.html:314
 msgid "Remarks"
 msgstr ""
-#: menus.py:6 templates/alsijil/print/full_register.html:16
+#: menus.py:6 preferences.py:8 templates/alsijil/print/full_register.html:16
 msgid "Class register"
 msgstr ""
@@ -76,306 +86,484 @@ msgstr ""
 msgid "Register absence"
 msgstr ""
-#: menus.py:34
+#: menus.py:34 models.py:32 templates/alsijil/excuse_type/list.html:8
-msgid "Personal note filters"
+#: templates/alsijil/excuse_type/list.html:9
+msgid "Excuse types"
+msgstr ""
+#: menus.py:40 models.py:66 models.py:138
+#: templates/alsijil/class_register/lesson.html:168
+#: templates/alsijil/extra_mark/list.html:8
+#: templates/alsijil/extra_mark/list.html:9
+#: templates/alsijil/print/full_register.html:293
+msgid "Extra marks"
+msgstr ""
+#: models.py:18 models.py:124
+msgid "Short name"
+msgstr ""
+#: models.py:20 models.py:126
+msgid "Name"
+msgstr ""
+#: models.py:31 models.py:60 templates/alsijil/class_register/lesson.html:167
+#: templates/alsijil/class_register/lesson.html:202
+msgid "Excuse type"
 msgstr ""
-#: models.py:51 templates/alsijil/print/full_register.html:271
+#: models.py:75
+msgid "Personal note"
+msgstr ""
+#: models.py:76 templates/alsijil/class_register/lesson.html:64
+#: templates/alsijil/class_register/lesson.html:156
+#: templates/alsijil/class_register/week_view.html:104
+msgid "Personal notes"
+msgstr ""
+#: models.py:99 templates/alsijil/class_register/week_view.html:56
+#: templates/alsijil/print/full_register.html:371
 msgid "Lesson topic"
 msgstr ""
-#: models.py:52 templates/alsijil/print/full_register.html:272
+#: models.py:100 templates/alsijil/print/full_register.html:372
 msgid "Homework"
 msgstr ""
-#: models.py:68
+#: models.py:102
-msgid "Identifier"
+msgid "Group note"
+msgstr ""
+#: models.py:106 templates/alsijil/class_register/lesson.html:60
+#: templates/alsijil/class_register/lesson.html:143
+msgid "Lesson documentation"
+msgstr ""
+#: models.py:107
+msgid "Lesson documentations"
 msgstr ""
-#: models.py:71 templates/alsijil/print/full_register.html:178
+#: models.py:137
-msgid "Description"
+msgid "Extra mark"
 msgstr ""
-#: models.py:74
+#: preferences.py:16
-msgid "Match expression"
+msgid "Block adding personal notes for cancelled lessons"
 msgstr ""
-#: tables.py:14
+#: tables.py:16 tables.py:36
 msgid "Edit"
 msgstr ""
-#: templates/alsijil/lesson.html:5
+#: tables.py:22 tables.py:42
+msgid "Delete"
+msgstr ""
+#: templates/alsijil/absences/register.html:5
+#: templates/alsijil/absences/register.html:6
+msgid "Manage absence"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:6
 msgid "Lesson"
 msgstr ""
-#: templates/alsijil/lesson.html:34
+#: templates/alsijil/class_register/lesson.html:14
-msgid "Lesson documentation"
+#: templates/alsijil/class_register/lesson.html:83
+#, python-format
+msgid "%(period)s. period"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:38
+msgid "Previous lesson"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:46
+msgid "Next lesson"
 msgstr ""
-#: templates/alsijil/lesson.html:43
+#: templates/alsijil/class_register/lesson.html:68
+#: templates/alsijil/class_register/lesson.html:249
 msgid "Change history"
 msgstr ""
-#: templates/alsijil/lesson.html:52 templates/alsijil/week_view.html:91
+#: templates/alsijil/class_register/lesson.html:82
-msgid "Personal notes"
+msgid "Overview: Previous lesson"
 msgstr ""
-#: templates/alsijil/lesson.html:60
+#: templates/alsijil/class_register/lesson.html:89
-#: templates/alsijil/print/full_register.html:202
+msgid "Lesson topic of previous lesson:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:96
+msgid "Homework for this lesson:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:103
+msgid "Group notes for previous lesson:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:110
+msgid "Absent persons:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:117
+msgid "Late persons:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:165
+#: templates/alsijil/print/full_register.html:287
 msgid "Tardiness"
 msgstr ""
-#: templates/alsijil/manage_personal_note_filter.html:5
+#: templates/alsijil/class_register/lesson.html:188
-#: templates/alsijil/manage_personal_note_filter.html:6
+msgid "Tardiness (in m)"
-msgid "Manage personal note filter"
 msgstr ""
-#: templates/alsijil/manage_personal_note_filter.html:11
+#: templates/alsijil/class_register/week_view.html:6
-msgid "Delete filter"
+msgid "Week view"
 msgstr ""
-#: templates/alsijil/personal_note_filters.html:7
+#: templates/alsijil/class_register/week_view.html:27
-#: templates/alsijil/personal_note_filters.html:8
+msgid "Select"
-msgid "List of all personal note filters"
 msgstr ""
-#: templates/alsijil/personal_note_filters.html:12
+#: templates/alsijil/class_register/week_view.html:33
-msgid "Add filter"
+#, python-format
+msgid "CW %(week)s: %(instance)s"
 msgstr ""
-#: templates/alsijil/print/full_register.html:22
+#: templates/alsijil/class_register/week_view.html:50
-#: templates/alsijil/print/full_register.html:54
+msgid "Period"
-msgid "Owners"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:52
+msgid "Groups"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:54
+#: templates/alsijil/print/full_register.html:169
+#: templates/alsijil/print/full_register.html:200
+msgid "Subject"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:55
+msgid "Teachers"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:110
+msgid "unexcused"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:113
+msgid "Summed up tardiness"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:142
+msgid "No lessons available"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:145
+msgid ""
+"\n"
+"            There are no lessons for the selected group or teacher in this week.\n"
+"          "
+msgstr ""
+#: templates/alsijil/excuse_type/create.html:6
+#: templates/alsijil/excuse_type/create.html:7
+#: templates/alsijil/excuse_type/list.html:16
+msgid "Create excuse type"
+msgstr ""
+#: templates/alsijil/excuse_type/edit.html:6
+#: templates/alsijil/excuse_type/edit.html:7
+msgid "Edit excuse type"
+msgstr ""
+#: templates/alsijil/excuse_type/warning.html:5
+msgid ""
+"\n"
+"      This function should only be used to define alternatives to the default excuse which also will be counted extra.\n"
+"      Don't use this to create a default excuse or if you don't divide between different types of excuse.\n"
+"    "
+msgstr ""
+#: templates/alsijil/extra_mark/create.html:6
+#: templates/alsijil/extra_mark/create.html:7
+#: templates/alsijil/extra_mark/list.html:14
+msgid "Create extra mark"
+msgstr ""
+#: templates/alsijil/extra_mark/edit.html:6
+#: templates/alsijil/extra_mark/edit.html:7
+msgid "Edit extra mark"
+msgstr ""
+#: templates/alsijil/partials/absences.html:4
+#: templates/alsijil/print/full_register.html:126
+msgid "(e)"
+msgstr ""
+#: templates/alsijil/partials/absences.html:4
+#: templates/alsijil/print/full_register.html:130
+msgid "(u)"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:6
+msgid "Data complete"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:12
+#: templates/alsijil/print/full_register.html:406
+msgid "Lesson cancelled"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:14
+msgid "Missing data"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:16
+msgid "Pending"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:18
+msgid "Substitution"
+msgstr ""
+#: templates/alsijil/print/full_register.html:6
+msgid "Class register:"
 msgstr ""
 #: templates/alsijil/print/full_register.html:26
+#: templates/alsijil/print/full_register.html:59
+msgid "Owners"
+msgstr ""
+#: templates/alsijil/print/full_register.html:30
 msgid "Printed on"
 msgstr ""
-#: templates/alsijil/print/full_register.html:34
+#: templates/alsijil/print/full_register.html:38
 msgid ""
 "\n"
-"            This printout is intended for archival purposes. The main copy "
+"        This printout is intended for archival purposes. The main copy of\n"
-"of\n"
+"        the class register is stored in the AlekSIS School Information\n"
-"            the class register is stored in the AlekSIS School Information\n"
+"        System.\n"
-"            System.\n"
+"      "
-"          "
 msgstr ""
-#: templates/alsijil/print/full_register.html:41
+#: templates/alsijil/print/full_register.html:45
 msgid ""
 "\n"
-"            Copies of the class register, both digital and as printout, "
+"        Copies of the class register, both digital and as printout, must\n"
-"must\n"
+"        only be kept inside the school and/or on devices authorised by the\n"
-"            only be kept inside the school and/or on devices authorised by "
+"        school.\n"
-"the\n"
+"      "
-"            school.\n"
-"          "
 msgstr ""
-#: templates/alsijil/print/full_register.html:48
+#: templates/alsijil/print/full_register.html:52
 msgid ""
 "\n"
-"            The owner of the group and the headteacher confirm the above, "
+"        The owner of the group and the headteacher confirm the above, as\n"
-"as\n"
+"        well as the correctness of this printout.\n"
-"            well as the correctness of this printout.\n"
+"      "
-"          "
 msgstr ""
-#: templates/alsijil/print/full_register.html:55
+#: templates/alsijil/print/full_register.html:62
 msgid "Headteacher"
 msgstr ""
-#: templates/alsijil/print/full_register.html:61
+#: templates/alsijil/print/full_register.html:69
+msgid "Abbreviations"
+msgstr ""
+#: templates/alsijil/print/full_register.html:71
+msgid "General"
+msgstr ""
+#: templates/alsijil/print/full_register.html:78
+msgid "Late"
+msgstr ""
+#: templates/alsijil/print/full_register.html:81
+#: templates/alsijil/print/full_register.html:283
+msgid "Unexcused"
+msgstr ""
+#: templates/alsijil/print/full_register.html:89
+msgid "Custom excuse types"
+msgstr ""
+#: templates/alsijil/print/full_register.html:101
+msgid "Available extra marks"
+msgstr ""
+#: templates/alsijil/print/full_register.html:115
 msgid "Persons in group"
 msgstr ""
-#: templates/alsijil/print/full_register.html:66
+#: templates/alsijil/print/full_register.html:120
 msgid "No."
 msgstr ""
-#: templates/alsijil/print/full_register.html:67
+#: templates/alsijil/print/full_register.html:121
 msgid "Last name"
 msgstr ""
-#: templates/alsijil/print/full_register.html:68
+#: templates/alsijil/print/full_register.html:122
 msgid "First name"
 msgstr ""
-#: templates/alsijil/print/full_register.html:69
+#: templates/alsijil/print/full_register.html:123
 msgid "Sex"
 msgstr ""
-#: templates/alsijil/print/full_register.html:70
+#: templates/alsijil/print/full_register.html:124
 msgid "Date of birth"
 msgstr ""
-#: templates/alsijil/print/full_register.html:71
+#: templates/alsijil/print/full_register.html:125
-#: templates/alsijil/print/full_register.html:200
+msgid "(a)"
-msgid "Absences"
 msgstr ""
-#: templates/alsijil/print/full_register.html:72
+#: templates/alsijil/print/full_register.html:131
-#: templates/alsijil/print/full_register.html:201
+msgid "(b)"
-msgid "Unexcused"
 msgstr ""
-#: templates/alsijil/print/full_register.html:73
+#: templates/alsijil/print/full_register.html:164
-#: templates/alsijil/print/full_register.html:224
-msgid "Tard."
-msgstr ""
-#: templates/alsijil/print/full_register.html:95
 msgid "Teachers and lessons in group"
 msgstr ""
-#: templates/alsijil/print/full_register.html:100
+#: templates/alsijil/print/full_register.html:171
-#: templates/alsijil/week_view.html:48
+#: templates/alsijil/print/full_register.html:202
-msgid "Subject"
-msgstr ""
-#: templates/alsijil/print/full_register.html:102
 msgid "Lesson start"
 msgstr ""
-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:172
+#: templates/alsijil/print/full_register.html:203
 msgid "Lesson end"
 msgstr ""
-#: templates/alsijil/print/full_register.html:104
+#: templates/alsijil/print/full_register.html:173
+#: templates/alsijil/print/full_register.html:204
 msgid "Per week"
 msgstr ""
-#: templates/alsijil/print/full_register.html:124
+#: templates/alsijil/print/full_register.html:194
+msgid "Teachers and lessons in child groups"
+msgstr ""
+#: templates/alsijil/print/full_register.html:227
 msgid "Personal overview"
 msgstr ""
-#: templates/alsijil/print/full_register.html:126
+#: templates/alsijil/print/full_register.html:229
 msgid "Contact details"
 msgstr ""
-#: templates/alsijil/print/full_register.html:174
+#: templates/alsijil/print/full_register.html:266
-msgid "Statistics on remarks"
+msgid "Absences and tardiness"
 msgstr ""
-#: templates/alsijil/print/full_register.html:179
+#: templates/alsijil/print/full_register.html:269
-msgid "Count"
+msgid "Absences"
 msgstr ""
-#: templates/alsijil/print/full_register.html:196
+#: templates/alsijil/print/full_register.html:274
-msgid "Absences and tardiness"
+msgid "thereof"
 msgstr ""
-#: templates/alsijil/print/full_register.html:215
+#: templates/alsijil/print/full_register.html:304
 msgid "Relevant personal notes"
 msgstr ""
-#: templates/alsijil/print/full_register.html:219
+#: templates/alsijil/print/full_register.html:308
 msgid "Date"
 msgstr ""
-#: templates/alsijil/print/full_register.html:220
+#: templates/alsijil/print/full_register.html:309
-#: templates/alsijil/print/full_register.html:268
+#: templates/alsijil/print/full_register.html:369
 msgid "Pe."
 msgstr ""
-#: templates/alsijil/print/full_register.html:221
+#: templates/alsijil/print/full_register.html:310
-#: templates/alsijil/print/full_register.html:269
+#: templates/alsijil/print/full_register.html:370
 msgid "Subj."
 msgstr ""
-#: templates/alsijil/print/full_register.html:222
+#: templates/alsijil/print/full_register.html:311
-#: templates/alsijil/print/full_register.html:274
+#: templates/alsijil/print/full_register.html:374
 msgid "Te."
 msgstr ""
-#: templates/alsijil/print/full_register.html:240
+#: templates/alsijil/print/full_register.html:313
-msgid "Yes"
+msgid "Tard."
 msgstr ""
-#: templates/alsijil/print/full_register.html:242
+#: templates/alsijil/print/full_register.html:330
-#: templates/alsijil/print/full_register.html:314
+msgid "Yes"
-#: templates/alsijil/print/full_register.html:324
-msgid "e"
 msgstr ""
-#: templates/alsijil/print/full_register.html:262
+#: templates/alsijil/print/full_register.html:335
-msgid "Lesson documentation for calendar week"
+#: templates/alsijil/print/full_register.html:424
+#: templates/alsijil/print/full_register.html:439
+msgid "e"
 msgstr ""
-#: templates/alsijil/print/full_register.html:270
+#: templates/alsijil/print/full_register.html:363
-msgid "Subs."
+msgid "Lesson documentation for week"
 msgstr ""
-#: templates/alsijil/print/full_register.html:273
+#: templates/alsijil/print/full_register.html:373
 msgid "Notes"
 msgstr ""
-#: templates/alsijil/print/full_register.html:301
+#: views.py:76
-msgid "Lesson cancelled"
+msgid "You either selected an invalid lesson or there is currently no lesson in progress."
 msgstr ""
-#: templates/alsijil/register_absence.html:5
+#: views.py:90
-#: templates/alsijil/register_absence.html:6
+msgid "You are not allowed to create a lesson documentation for a lesson in the future."
-msgid "Manage absence"
 msgstr ""
-#: templates/alsijil/week_view.html:6
+#: views.py:116
-msgid "Week view"
+msgid "The lesson documentation has been saved."
 msgstr ""
-#: templates/alsijil/week_view.html:21
+#: views.py:136
-msgid "Select"
+msgid "The personal notes have been saved."
 msgstr ""
-#: templates/alsijil/week_view.html:47
+#: views.py:327
-msgid "Period"
+msgid "There is no current school term."
-msgstr ""
-#: templates/alsijil/week_view.html:49
-msgid "Teachers"
-msgstr ""
-#: templates/alsijil/week_view.html:97
-msgid "unexcused"
 msgstr ""
-#: templates/alsijil/week_view.html:100
+#: views.py:463
-msgid "Summed up tardiness"
+msgid "The absence has been saved."
-msgstr ""
-#: templates/alsijil/week_view.html:122
-msgid "No group selected"
 msgstr ""
-#: templates/alsijil/week_view.html:125
+#: views.py:488
-msgid ""
+msgid "The extra mark has been created."
-"\n"
-"            There are no lessons for the selected group, teacher, room or "
-"time.\n"
-"          "
 msgstr ""
-#: views.py:56
+#: views.py:499
-msgid ""
+msgid "The extra mark has been saved."
-"You either selected an invalid lesson or there is currently no lesson in "
-"progress."
 msgstr ""
-#: views.py:68
+#: views.py:509
-msgid ""
+msgid "The extra mark has been deleted."
-"You are not allowed to create a lesson documentation for a lesson in the "
-"future."
 msgstr ""
-#: views.py:306
+#: views.py:529
-msgid "The absence has been saved."
+msgid "The excuse type has been created."
 msgstr ""
-#: views.py:344
+#: views.py:540
-msgid "The filter has been saved"
+msgid "The excuse type has been saved."
 msgstr ""
-#: views.py:360
+#: views.py:550
-msgid "The filter has been deleted."
+msgid "The excuse type has been deleted."
 msgstr ""
--- a/aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-01 13:20+0200\n"
+"POT-Creation-Date: 2020-08-03 20:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,50 +17,60 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-#: forms.py:41
+#: forms.py:25
+msgid "Homework for the next lesson"
+msgstr ""
+#: forms.py:50 templates/alsijil/print/full_register.html:199
 msgid "Group"
 msgstr ""
-#: forms.py:49 templates/alsijil/print/full_register.html:101
+#: forms.py:56 templates/alsijil/print/full_register.html:170
+#: templates/alsijil/print/full_register.html:201
 msgid "Teacher"
 msgstr ""
-#: forms.py:57
+#: forms.py:73
-msgid "Room"
+msgid "You can't select a group and a teacher both."
 msgstr ""
-#: forms.py:70
+#: forms.py:101
 msgid "Start date"
 msgstr ""
-#: forms.py:73
+#: forms.py:102
 msgid "End date"
 msgstr ""
-#: forms.py:75
+#: forms.py:103
 msgid "From period"
 msgstr ""
-#: forms.py:77 templates/alsijil/lesson.html:58
+#: forms.py:105 templates/alsijil/class_register/lesson.html:163
 msgid "Person"
 msgstr ""
-#: forms.py:79 templates/alsijil/lesson.html:59
+#: forms.py:107 templates/alsijil/class_register/lesson.html:164
-#: templates/alsijil/print/full_register.html:223
+#: templates/alsijil/class_register/week_view.html:109
-#: templates/alsijil/week_view.html:96
+#: templates/alsijil/print/full_register.html:75
+#: templates/alsijil/print/full_register.html:312
 msgid "Absent"
 msgstr ""
-#: forms.py:80 templates/alsijil/lesson.html:61
+#: forms.py:108 templates/alsijil/class_register/lesson.html:166
+#: templates/alsijil/print/full_register.html:84
+#: templates/alsijil/print/full_register.html:275
 msgid "Excused"
 msgstr ""
-#: forms.py:81 templates/alsijil/lesson.html:62
+#: forms.py:109 templates/alsijil/class_register/lesson.html:170
-#: templates/alsijil/print/full_register.html:225
+#: templates/alsijil/class_register/lesson.html:223
+#: templates/alsijil/class_register/lesson.html:231
+#: templates/alsijil/print/full_register.html:314
 msgid "Remarks"
 msgstr ""
-#: menus.py:6 templates/alsijil/print/full_register.html:16
+#: menus.py:6 preferences.py:8 templates/alsijil/print/full_register.html:16
 msgid "Class register"
 msgstr ""
@@ -76,306 +86,484 @@ msgstr ""
 msgid "Register absence"
 msgstr ""
-#: menus.py:34
+#: menus.py:34 models.py:32 templates/alsijil/excuse_type/list.html:8
-msgid "Personal note filters"
+#: templates/alsijil/excuse_type/list.html:9
+msgid "Excuse types"
+msgstr ""
+#: menus.py:40 models.py:66 models.py:138
+#: templates/alsijil/class_register/lesson.html:168
+#: templates/alsijil/extra_mark/list.html:8
+#: templates/alsijil/extra_mark/list.html:9
+#: templates/alsijil/print/full_register.html:293
+msgid "Extra marks"
+msgstr ""
+#: models.py:18 models.py:124
+msgid "Short name"
+msgstr ""
+#: models.py:20 models.py:126
+msgid "Name"
+msgstr ""
+#: models.py:31 models.py:60 templates/alsijil/class_register/lesson.html:167
+#: templates/alsijil/class_register/lesson.html:202
+msgid "Excuse type"
 msgstr ""
-#: models.py:51 templates/alsijil/print/full_register.html:271
+#: models.py:75
+msgid "Personal note"
+msgstr ""
+#: models.py:76 templates/alsijil/class_register/lesson.html:64
+#: templates/alsijil/class_register/lesson.html:156
+#: templates/alsijil/class_register/week_view.html:104
+msgid "Personal notes"
+msgstr ""
+#: models.py:99 templates/alsijil/class_register/week_view.html:56
+#: templates/alsijil/print/full_register.html:371
 msgid "Lesson topic"
 msgstr ""
-#: models.py:52 templates/alsijil/print/full_register.html:272
+#: models.py:100 templates/alsijil/print/full_register.html:372
 msgid "Homework"
 msgstr ""
-#: models.py:68
+#: models.py:102
-msgid "Identifier"
+msgid "Group note"
+msgstr ""
+#: models.py:106 templates/alsijil/class_register/lesson.html:60
+#: templates/alsijil/class_register/lesson.html:143
+msgid "Lesson documentation"
+msgstr ""
+#: models.py:107
+msgid "Lesson documentations"
 msgstr ""
-#: models.py:71 templates/alsijil/print/full_register.html:178
+#: models.py:137
-msgid "Description"
+msgid "Extra mark"
 msgstr ""
-#: models.py:74
+#: preferences.py:16
-msgid "Match expression"
+msgid "Block adding personal notes for cancelled lessons"
 msgstr ""
-#: tables.py:14
+#: tables.py:16 tables.py:36
 msgid "Edit"
 msgstr ""
-#: templates/alsijil/lesson.html:5
+#: tables.py:22 tables.py:42
+msgid "Delete"
+msgstr ""
+#: templates/alsijil/absences/register.html:5
+#: templates/alsijil/absences/register.html:6
+msgid "Manage absence"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:6
 msgid "Lesson"
 msgstr ""
-#: templates/alsijil/lesson.html:34
+#: templates/alsijil/class_register/lesson.html:14
-msgid "Lesson documentation"
+#: templates/alsijil/class_register/lesson.html:83
+#, python-format
+msgid "%(period)s. period"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:38
+msgid "Previous lesson"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:46
+msgid "Next lesson"
 msgstr ""
-#: templates/alsijil/lesson.html:43
+#: templates/alsijil/class_register/lesson.html:68
+#: templates/alsijil/class_register/lesson.html:249
 msgid "Change history"
 msgstr ""
-#: templates/alsijil/lesson.html:52 templates/alsijil/week_view.html:91
+#: templates/alsijil/class_register/lesson.html:82
-msgid "Personal notes"
+msgid "Overview: Previous lesson"
 msgstr ""
-#: templates/alsijil/lesson.html:60
+#: templates/alsijil/class_register/lesson.html:89
-#: templates/alsijil/print/full_register.html:202
+msgid "Lesson topic of previous lesson:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:96
+msgid "Homework for this lesson:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:103
+msgid "Group notes for previous lesson:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:110
+msgid "Absent persons:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:117
+msgid "Late persons:"
+msgstr ""
+#: templates/alsijil/class_register/lesson.html:165
+#: templates/alsijil/print/full_register.html:287
 msgid "Tardiness"
 msgstr ""
-#: templates/alsijil/manage_personal_note_filter.html:5
+#: templates/alsijil/class_register/lesson.html:188
-#: templates/alsijil/manage_personal_note_filter.html:6
+msgid "Tardiness (in m)"
-msgid "Manage personal note filter"
 msgstr ""
-#: templates/alsijil/manage_personal_note_filter.html:11
+#: templates/alsijil/class_register/week_view.html:6
-msgid "Delete filter"
+msgid "Week view"
 msgstr ""
-#: templates/alsijil/personal_note_filters.html:7
+#: templates/alsijil/class_register/week_view.html:27
-#: templates/alsijil/personal_note_filters.html:8
+msgid "Select"
-msgid "List of all personal note filters"
 msgstr ""
-#: templates/alsijil/personal_note_filters.html:12
+#: templates/alsijil/class_register/week_view.html:33
-msgid "Add filter"
+#, python-format
+msgid "CW %(week)s: %(instance)s"
 msgstr ""
-#: templates/alsijil/print/full_register.html:22
+#: templates/alsijil/class_register/week_view.html:50
-#: templates/alsijil/print/full_register.html:54
+msgid "Period"
-msgid "Owners"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:52
+msgid "Groups"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:54
+#: templates/alsijil/print/full_register.html:169
+#: templates/alsijil/print/full_register.html:200
+msgid "Subject"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:55
+msgid "Teachers"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:110
+msgid "unexcused"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:113
+msgid "Summed up tardiness"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:142
+msgid "No lessons available"
+msgstr ""
+#: templates/alsijil/class_register/week_view.html:145
+msgid ""
+"\n"
+"            There are no lessons for the selected group or teacher in this week.\n"
+"          "
+msgstr ""
+#: templates/alsijil/excuse_type/create.html:6
+#: templates/alsijil/excuse_type/create.html:7
+#: templates/alsijil/excuse_type/list.html:16
+msgid "Create excuse type"
+msgstr ""
+#: templates/alsijil/excuse_type/edit.html:6
+#: templates/alsijil/excuse_type/edit.html:7
+msgid "Edit excuse type"
+msgstr ""
+#: templates/alsijil/excuse_type/warning.html:5
+msgid ""
+"\n"
+"      This function should only be used to define alternatives to the default excuse which also will be counted extra.\n"
+"      Don't use this to create a default excuse or if you don't divide between different types of excuse.\n"
+"    "
+msgstr ""
+#: templates/alsijil/extra_mark/create.html:6
+#: templates/alsijil/extra_mark/create.html:7
+#: templates/alsijil/extra_mark/list.html:14
+msgid "Create extra mark"
+msgstr ""
+#: templates/alsijil/extra_mark/edit.html:6
+#: templates/alsijil/extra_mark/edit.html:7
+msgid "Edit extra mark"
+msgstr ""
+#: templates/alsijil/partials/absences.html:4
+#: templates/alsijil/print/full_register.html:126
+msgid "(e)"
+msgstr ""
+#: templates/alsijil/partials/absences.html:4
+#: templates/alsijil/print/full_register.html:130
+msgid "(u)"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:6
+msgid "Data complete"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:12
+#: templates/alsijil/print/full_register.html:406
+msgid "Lesson cancelled"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:14
+msgid "Missing data"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:16
+msgid "Pending"
+msgstr ""
+#: templates/alsijil/partials/lesson_status_icon.html:18
+msgid "Substitution"
+msgstr ""
+#: templates/alsijil/print/full_register.html:6
+msgid "Class register:"
 msgstr ""
 #: templates/alsijil/print/full_register.html:26
+#: templates/alsijil/print/full_register.html:59
+msgid "Owners"
+msgstr ""
+#: templates/alsijil/print/full_register.html:30
 msgid "Printed on"
 msgstr ""
-#: templates/alsijil/print/full_register.html:34
+#: templates/alsijil/print/full_register.html:38
 msgid ""
 "\n"
-"            This printout is intended for archival purposes. The main copy "
+"        This printout is intended for archival purposes. The main copy of\n"
-"of\n"
+"        the class register is stored in the AlekSIS School Information\n"
-"            the class register is stored in the AlekSIS School Information\n"
+"        System.\n"
-"            System.\n"
+"      "
-"          "
 msgstr ""
-#: templates/alsijil/print/full_register.html:41
+#: templates/alsijil/print/full_register.html:45
 msgid ""
 "\n"
-"            Copies of the class register, both digital and as printout, "
+"        Copies of the class register, both digital and as printout, must\n"
-"must\n"
+"        only be kept inside the school and/or on devices authorised by the\n"
-"            only be kept inside the school and/or on devices authorised by "
+"        school.\n"
-"the\n"
+"      "
-"            school.\n"
-"          "
 msgstr ""
-#: templates/alsijil/print/full_register.html:48
+#: templates/alsijil/print/full_register.html:52
 msgid ""
 "\n"
-"            The owner of the group and the headteacher confirm the above, "
+"        The owner of the group and the headteacher confirm the above, as\n"
-"as\n"
+"        well as the correctness of this printout.\n"
-"            well as the correctness of this printout.\n"
+"      "
-"          "
 msgstr ""
-#: templates/alsijil/print/full_register.html:55
+#: templates/alsijil/print/full_register.html:62
 msgid "Headteacher"
 msgstr ""
-#: templates/alsijil/print/full_register.html:61
+#: templates/alsijil/print/full_register.html:69
+msgid "Abbreviations"
+msgstr ""
+#: templates/alsijil/print/full_register.html:71
+msgid "General"
+msgstr ""
+#: templates/alsijil/print/full_register.html:78
+msgid "Late"
+msgstr ""
+#: templates/alsijil/print/full_register.html:81
+#: templates/alsijil/print/full_register.html:283
+msgid "Unexcused"
+msgstr ""
+#: templates/alsijil/print/full_register.html:89
+msgid "Custom excuse types"
+msgstr ""
+#: templates/alsijil/print/full_register.html:101
+msgid "Available extra marks"
+msgstr ""
+#: templates/alsijil/print/full_register.html:115
 msgid "Persons in group"
 msgstr ""
-#: templates/alsijil/print/full_register.html:66
+#: templates/alsijil/print/full_register.html:120
 msgid "No."
 msgstr ""
-#: templates/alsijil/print/full_register.html:67
+#: templates/alsijil/print/full_register.html:121
 msgid "Last name"
 msgstr ""
-#: templates/alsijil/print/full_register.html:68
+#: templates/alsijil/print/full_register.html:122
 msgid "First name"
 msgstr ""
-#: templates/alsijil/print/full_register.html:69
+#: templates/alsijil/print/full_register.html:123
 msgid "Sex"
 msgstr ""
-#: templates/alsijil/print/full_register.html:70
+#: templates/alsijil/print/full_register.html:124
 msgid "Date of birth"
 msgstr ""
-#: templates/alsijil/print/full_register.html:71
+#: templates/alsijil/print/full_register.html:125
-#: templates/alsijil/print/full_register.html:200
+msgid "(a)"
-msgid "Absences"
 msgstr ""
-#: templates/alsijil/print/full_register.html:72
+#: templates/alsijil/print/full_register.html:131
-#: templates/alsijil/print/full_register.html:201
+msgid "(b)"
-msgid "Unexcused"
 msgstr ""
-#: templates/alsijil/print/full_register.html:73
+#: templates/alsijil/print/full_register.html:164
-#: templates/alsijil/print/full_register.html:224
-msgid "Tard."
-msgstr ""
-#: templates/alsijil/print/full_register.html:95
 msgid "Teachers and lessons in group"
 msgstr ""
-#: templates/alsijil/print/full_register.html:100
+#: templates/alsijil/print/full_register.html:171
-#: templates/alsijil/week_view.html:48
+#: templates/alsijil/print/full_register.html:202
-msgid "Subject"
-msgstr ""
-#: templates/alsijil/print/full_register.html:102
 msgid "Lesson start"
 msgstr ""
-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:172
+#: templates/alsijil/print/full_register.html:203
 msgid "Lesson end"
 msgstr ""
-#: templates/alsijil/print/full_register.html:104
+#: templates/alsijil/print/full_register.html:173
+#: templates/alsijil/print/full_register.html:204
 msgid "Per week"
 msgstr ""
-#: templates/alsijil/print/full_register.html:124
+#: templates/alsijil/print/full_register.html:194
+msgid "Teachers and lessons in child groups"
+msgstr ""
+#: templates/alsijil/print/full_register.html:227
 msgid "Personal overview"
 msgstr ""
-#: templates/alsijil/print/full_register.html:126
+#: templates/alsijil/print/full_register.html:229
 msgid "Contact details"
 msgstr ""
-#: templates/alsijil/print/full_register.html:174
+#: templates/alsijil/print/full_register.html:266
-msgid "Statistics on remarks"
+msgid "Absences and tardiness"
 msgstr ""
-#: templates/alsijil/print/full_register.html:179
+#: templates/alsijil/print/full_register.html:269
-msgid "Count"
+msgid "Absences"
 msgstr ""
-#: templates/alsijil/print/full_register.html:196
+#: templates/alsijil/print/full_register.html:274
-msgid "Absences and tardiness"
+msgid "thereof"
 msgstr ""
-#: templates/alsijil/print/full_register.html:215
+#: templates/alsijil/print/full_register.html:304
 msgid "Relevant personal notes"
 msgstr ""
-#: templates/alsijil/print/full_register.html:219
+#: templates/alsijil/print/full_register.html:308
 msgid "Date"
 msgstr ""
-#: templates/alsijil/print/full_register.html:220
+#: templates/alsijil/print/full_register.html:309
-#: templates/alsijil/print/full_register.html:268
+#: templates/alsijil/print/full_register.html:369
 msgid "Pe."
 msgstr ""
-#: templates/alsijil/print/full_register.html:221
+#: templates/alsijil/print/full_register.html:310
-#: templates/alsijil/print/full_register.html:269
+#: templates/alsijil/print/full_register.html:370
 msgid "Subj."
 msgstr ""
-#: templates/alsijil/print/full_register.html:222
+#: templates/alsijil/print/full_register.html:311
-#: templates/alsijil/print/full_register.html:274
+#: templates/alsijil/print/full_register.html:374
 msgid "Te."
 msgstr ""
-#: templates/alsijil/print/full_register.html:240
+#: templates/alsijil/print/full_register.html:313
-msgid "Yes"
+msgid "Tard."
 msgstr ""
-#: templates/alsijil/print/full_register.html:242
+#: templates/alsijil/print/full_register.html:330
-#: templates/alsijil/print/full_register.html:314
+msgid "Yes"
-#: templates/alsijil/print/full_register.html:324
-msgid "e"
 msgstr ""
-#: templates/alsijil/print/full_register.html:262
+#: templates/alsijil/print/full_register.html:335
-msgid "Lesson documentation for calendar week"
+#: templates/alsijil/print/full_register.html:424
+#: templates/alsijil/print/full_register.html:439
+msgid "e"
 msgstr ""
-#: templates/alsijil/print/full_register.html:270
+#: templates/alsijil/print/full_register.html:363
-msgid "Subs."
+msgid "Lesson documentation for week"
 msgstr ""
-#: templates/alsijil/print/full_register.html:273
+#: templates/alsijil/print/full_register.html:373
 msgid "Notes"
 msgstr ""
-#: templates/alsijil/print/full_register.html:301
+#: views.py:76
-msgid "Lesson cancelled"
+msgid "You either selected an invalid lesson or there is currently no lesson in progress."
 msgstr ""
-#: templates/alsijil/register_absence.html:5
+#: views.py:90
-#: templates/alsijil/register_absence.html:6
+msgid "You are not allowed to create a lesson documentation for a lesson in the future."
-msgid "Manage absence"
 msgstr ""
-#: templates/alsijil/week_view.html:6
+#: views.py:116
-msgid "Week view"
+msgid "The lesson documentation has been saved."
 msgstr ""
-#: templates/alsijil/week_view.html:21
+#: views.py:136
-msgid "Select"
+msgid "The personal notes have been saved."
 msgstr ""
-#: templates/alsijil/week_view.html:47
+#: views.py:327
-msgid "Period"
+msgid "There is no current school term."
-msgstr ""
-#: templates/alsijil/week_view.html:49
-msgid "Teachers"
-msgstr ""
-#: templates/alsijil/week_view.html:97
-msgid "unexcused"
 msgstr ""
-#: templates/alsijil/week_view.html:100
+#: views.py:463
-msgid "Summed up tardiness"
+msgid "The absence has been saved."
-msgstr ""
-#: templates/alsijil/week_view.html:122
-msgid "No group selected"
 msgstr ""
-#: templates/alsijil/week_view.html:125
+#: views.py:488
-msgid ""
+msgid "The extra mark has been created."
-"\n"
-"            There are no lessons for the selected group, teacher, room or "
-"time.\n"
-"          "
 msgstr ""
-#: views.py:56
+#: views.py:499
-msgid ""
+msgid "The extra mark has been saved."
-"You either selected an invalid lesson or there is currently no lesson in "
-"progress."
 msgstr ""
-#: views.py:68
+#: views.py:509
-msgid ""
+msgid "The extra mark has been deleted."
-"You are not allowed to create a lesson documentation for a lesson in the "
-"future."
 msgstr ""
-#: views.py:306
+#: views.py:529
-msgid "The absence has been saved."
+msgid "The excuse type has been created."
 msgstr ""
-#: views.py:344
+#: views.py:540
-msgid "The filter has been saved"
+msgid "The excuse type has been saved."
 msgstr ""
-#: views.py:360
+#: views.py:550
-msgid "The filter has been deleted."
+msgid "The excuse type has been deleted."
 msgstr ""
--- a/aleksis/apps/alsijil/menus.py
+++ b/aleksis/apps/alsijil/menus.py
@@ -31,14 +31,14 @@ MENUS = {
                    "validators": ["menu_generator.validators.is_superuser"],
                },
                {
-                    "name": _("Personal note filters"),
+                    "name": _("Excuse types"),
-                    "url": "list_personal_note_filters",
+                    "url": "excuse_types",
-                    "icon": "filter_list",
+                    "icon": "label",
                    "validators": ["menu_generator.validators.is_superuser"],
                },
                {
-                    "name": _("Excuse types"),
+                    "name": _("Extra marks"),
-                    "url": "excuse_types",
+                    "url": "extra_marks",
                    "icon": "label",
                    "validators": ["menu_generator.validators.is_superuser"],
                },

--- a/aleksis/apps/alsijil/migrations/0003_extra_mark.py
+++ b/aleksis/apps/alsijil/migrations/0003_extra_mark.py
+# Generated by Django 3.0.8 on 2020-07-12 12:43
+import django.contrib.postgres.fields.jsonb
+import django.contrib.sites.managers
+import django.db.models.deletion
+from django.db import migrations, models
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sites", "0002_alter_domain_unique"),
+        ("alsijil", "0002_excuse_type"),
+    ]
+    operations = [
+        migrations.CreateModel(
+            name="ExtraMark",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "extended_data",
+                    django.contrib.postgres.fields.jsonb.JSONField(
+                        default=dict, editable=False
+                    ),
+                ),
+                (
+                    "short_name",
+                    models.CharField(
+                        max_length=255, unique=True, verbose_name="Short name"
+                    ),
+                ),
+                (
+                    "name",
+                    models.CharField(max_length=255, unique=True, verbose_name="Name"),
+                ),
+                (
+                    "site",
+                    models.ForeignKey(
+                        default=1,
+                        editable=False,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="sites.Site",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Extra mark",
+                "verbose_name_plural": "Extra marks",
+                "ordering": ["short_name"],
+            },
+            managers=[("objects", django.contrib.sites.managers.CurrentSiteManager()),],
+        ),
+        migrations.AddField(
+            model_name="personalnote",
+            name="extra_marks",
+            field=models.ManyToManyField(
+                blank=True,
+                null=True,
+                to="alsijil.ExtraMark",
+                verbose_name="Extra marks",
+            ),
+        ),
+    ]
--- a/aleksis/apps/alsijil/migrations/0004_group_notes.py
+++ b/aleksis/apps/alsijil/migrations/0004_group_notes.py
+# Generated by Django 3.0.8 on 2020-07-10 16:16
+from django.db import migrations, models
+class Migration(migrations.Migration):
+    dependencies = [
+        ("alsijil", "0003_extra_mark"),
+    ]
+    operations = [
+        migrations.AddField(
+            model_name="lessondocumentation",
+            name="group_note",
+            field=models.CharField(
+                blank=True, max_length=200, verbose_name="Group note"
+            ),
+        ),
+    ]
--- a/aleksis/apps/alsijil/migrations/0005_groups_of_person.py
+++ b/aleksis/apps/alsijil/migrations/0005_groups_of_person.py
+# Generated by Django 3.0.8 on 2020-07-22 17:29
+from django.db import migrations, models
+def add_groups(apps, schema_editor):
+    PersonalNote = apps.get_model("alsijil", "PersonalNote")
+    db_alias = schema_editor.connection.alias
+    for personal_note in PersonalNote.objects.using(db_alias).all():
+        groups = list(personal_note.person.member_of.using(db_alias).all())
+        personal_note.groups_of_person.set(groups)
+        personal_note.save()
+class Migration(migrations.Migration):
+    dependencies = [
+        ("core", "0003_drop_image_cropping"),
+        ("alsijil", "0004_group_notes"),
+    ]
+    operations = [
+        migrations.AddField(
+            model_name="personalnote",
+            name="groups_of_person",
+            field=models.ManyToManyField(
+                related_name="_personalnote_groups_of_person_+", to="core.Group"
+            ),
+        ),
+        migrations.RunPython(add_groups),
+    ]
--- a/aleksis/apps/alsijil/migrations/0006_delete_personal_notes_filter.py
+++ b/aleksis/apps/alsijil/migrations/0006_delete_personal_notes_filter.py
+# Generated by Django 3.0.8 on 2020-07-18 15:23
+from django.db import migrations
+class Migration(migrations.Migration):
+    dependencies = [
+        ("alsijil", "0005_groups_of_person"),
+    ]
+    operations = [
+        migrations.DeleteModel(name="PersonalNoteFilter",),
+    ]
--- a/aleksis/apps/alsijil/migrations/0007_personal_note_lesson_documentation_year.py
+++ b/aleksis/apps/alsijil/migrations/0007_personal_note_lesson_documentation_year.py
+# Generated by Django 3.0.9 on 2020-08-15 09:39
+from django.db import migrations, models
+import aleksis.apps.chronos.util.date
+def migrate_data(apps, schema_editor):
+    PersonalNote = apps.get_model("alsijil", "PersonalNote")
+    LessonDocumentation = apps.get_model("alsijil", "LessonDocumentation")
+    db_alias = schema_editor.connection.alias
+    for note in PersonalNote.objects.using(db_alias).all():
+        year = note.lesson_period.lesson.validity.date_start.year
+        if note.week < int(
+            note.lesson_period.lesson.validity.date_start.strftime("%V")
+        ):
+            year += 1
+        note.year = year
+        note.save()
+    for doc in LessonDocumentation.objects.using(db_alias).all():
+        year = doc.lesson_period.lesson.validity.date_start.year
+        if doc.week < int(doc.lesson_period.lesson.validity.date_start.strftime("%V")):
+            year += 1
+        doc.year = year
+        doc.save()
+class Migration(migrations.Migration):
+    dependencies = [
+        ("alsijil", "0006_delete_personal_notes_filter"),
+    ]
+    operations = [
+        migrations.AddField(
+            model_name="lessondocumentation",
+            name="year",
+            field=models.IntegerField(
+                default=aleksis.apps.chronos.util.date.get_current_year,
+                verbose_name="Year",
+            ),
+        ),
+        migrations.AddField(
+            model_name="personalnote",
+            name="year",
+            field=models.IntegerField(
+                default=aleksis.apps.chronos.util.date.get_current_year,
+                verbose_name="Year",
+            ),
+        ),
+        migrations.RunPython(migrate_data),
+    ]
--- a/aleksis/apps/alsijil/model_extensions.py
+++ b/aleksis/apps/alsijil/model_extensions.py
 from datetime import date
-from typing import Optional, Union
+from typing import Dict, Optional, Union
 from django.db.models import Exists, OuterRef, QuerySet
@@ -8,7 +8,7 @@ from calendarweek import CalendarWeek
 from aleksis.apps.chronos.models import LessonPeriod
 from aleksis.core.models import Group, Person
-from .models import ExcuseType, LessonDocumentation, PersonalNote
+from .models import ExcuseType, ExtraMark, LessonDocumentation, PersonalNote
 @Person.method
@@ -45,8 +45,10 @@ def mark_absent(
            person=self,
            lesson_period=lesson_period,
            week=wanted_week.week,
+            year=wanted_week.year,
            defaults={"absent": absent, "excused": excused, "excuse_type": excuse_type},
        )
+        personal_note.groups_of_person.set(self.member_of.all())
        if remarks:
            if personal_note.remarks:
@@ -73,7 +75,10 @@ def get_personal_notes(self, wanted_week: CalendarWeek):
    missing_persons = Person.objects.annotate(
        no_personal_notes=~Exists(
            PersonalNote.objects.filter(
-                week=wanted_week.week, lesson_period=self, person__pk=OuterRef("pk")
+                week=wanted_week.week,
+                year=wanted_week.year,
+                lesson_period=self,
+                person__pk=OuterRef("pk"),
            )
        )
    ).filter(
@@ -83,15 +88,22 @@ def get_personal_notes(self, wanted_week: CalendarWeek):
    )
    # Create all missing personal notes
-    PersonalNote.objects.bulk_create(
+    new_personal_notes = [
-        [
+        PersonalNote(
-            PersonalNote(person=person, lesson_period=self, week=wanted_week.week)
+            person=person,
-            for person in missing_persons
+            lesson_period=self,
-        ]
+            week=wanted_week.week,
-    )
+            year=wanted_week.year,
+        )
+        for person in missing_persons
+    ]
+    PersonalNote.objects.bulk_create(new_personal_notes)
+    for personal_note in new_personal_notes:
+        personal_note.groups_of_person.set(personal_note.person.member_of.all())
    return PersonalNote.objects.select_related("person").filter(
-        lesson_period=self, week=wanted_week.week
+        lesson_period=self, week=wanted_week.week, year=wanted_week.year
    )
@@ -103,7 +115,9 @@ def get_lesson_documentation(
    if not week:
        week = self.week
    try:
-        return LessonDocumentation.objects.get(lesson_period=self, week=week.week)
+        return LessonDocumentation.objects.get(
+            lesson_period=self, week=week.week, year=week.year
+        )
    except LessonDocumentation.DoesNotExist:
        return None
@@ -116,7 +130,7 @@ def get_or_create_lesson_documentation(
    if not week:
        week = self.week
    lesson_documentation, created = LessonDocumentation.objects.get_or_create(
-        lesson_period=self, week=week.week
+        lesson_period=self, week=week.week, year=week.year
    )
    return lesson_documentation
@@ -126,7 +140,7 @@ def get_absences(self, week: Optional[CalendarWeek] = None) -> QuerySet:
    """Get all personal notes of absent persons for this lesson."""
    if not week:
        week = self.week
-    return self.personal_notes.filter(week=week.week, absent=True)
+    return self.personal_notes.filter(week=week.week, year=week.year, absent=True)
 @LessonPeriod.method
@@ -134,7 +148,9 @@ def get_excused_absences(self, week: Optional[CalendarWeek] = None) -> QuerySet:
    """Get all personal notes of excused absent persons for this lesson."""
    if not week:
        week = self.week
-    return self.personal_notes.filter(week=week.week, absent=True, excused=True)
+    return self.personal_notes.filter(
+        week=week.week, year=week.year, absent=True, excused=True
+    )
 @LessonPeriod.method
@@ -142,7 +158,9 @@ def get_unexcused_absences(self, week: Optional[CalendarWeek] = None) -> QuerySe
    """Get all personal notes of unexcused absent persons for this lesson."""
    if not week:
        week = self.week
-    return self.personal_notes.filter(week=week.week, absent=True, excused=False)
+    return self.personal_notes.filter(
+        week=week.week, year=week.year, absent=True, excused=False
+    )
 @LessonPeriod.method
@@ -150,4 +168,23 @@ def get_tardinesses(self, week: Optional[CalendarWeek] = None) -> QuerySet:
    """Get all personal notes of late persons for this lesson."""
    if not week:
        week = self.week
-    return self.personal_notes.filter(week=week.week, late__gt=0)
+    return self.personal_notes.filter(week=week.week, year=week.year, late__gt=0)
+@LessonPeriod.method
+def get_extra_marks(
+    self, week: Optional[CalendarWeek] = None
+) -> Dict[ExtraMark, QuerySet]:
+    """Get all statistics on extra marks for this lesson."""
+    if not week:
+        week = self.week
+    stats = {}
+    for extra_mark in ExtraMark.objects.all():
+        qs = self.personal_notes.filter(
+            week=week.week, year=week.year, extra_marks=extra_mark
+        )
+        if qs:
+            stats[extra_mark] = qs
+    return stats
--- a/aleksis/apps/alsijil/models.py
+++ b/aleksis/apps/alsijil/models.py
 from django.db import models
 from django.utils.translation import gettext_lazy as _
+from calendarweek import CalendarWeek
+from aleksis.apps.chronos.mixins import WeekRelatedMixin
+from aleksis.apps.chronos.models import LessonPeriod
+from aleksis.apps.chronos.util.date import get_current_year
 from aleksis.core.mixins import ExtensibleModel
+from aleksis.core.util.core_helpers import get_site_preferences
 def isidentifier(value: str) -> bool:
@@ -32,7 +38,7 @@ class ExcuseType(ExtensibleModel):
        verbose_name_plural = _("Excuse types")
-class PersonalNote(ExtensibleModel):
+class PersonalNote(ExtensibleModel, WeekRelatedMixin):
    """A personal note about a single person.
    Used in the class register to note absences, excuses
@@ -42,8 +48,11 @@ class PersonalNote(ExtensibleModel):
    person = models.ForeignKey(
        "core.Person", models.CASCADE, related_name="personal_notes"
    )
+    groups_of_person = models.ManyToManyField("core.Group", related_name="+")
    week = models.IntegerField()
+    year = models.IntegerField(verbose_name=_("Year"), default=get_current_year)
    lesson_period = models.ForeignKey(
        "chronos.LessonPeriod", models.CASCADE, related_name="personal_notes"
    )
@@ -61,6 +70,10 @@ class PersonalNote(ExtensibleModel):
    remarks = models.CharField(max_length=200, blank=True)
+    extra_marks = models.ManyToManyField(
+        "ExtraMark", null=True, blank=True, verbose_name=_("Extra marks")
+    )
    def save(self, *args, **kwargs):
        if self.excuse_type:
            self.excused = True
@@ -71,7 +84,7 @@ class PersonalNote(ExtensibleModel):
        verbose_name_plural = _("Personal notes")
        unique_together = [["lesson_period", "week", "person"]]
        ordering = [
-            "lesson_period__lesson__validity__date_start",
+            "year",
            "week",
            "lesson_period__period__weekday",
            "lesson_period__period__period",
@@ -80,50 +93,95 @@ class PersonalNote(ExtensibleModel):
        ]
-class LessonDocumentation(ExtensibleModel):
+class LessonDocumentation(ExtensibleModel, WeekRelatedMixin):
    """A documentation on a single lesson period.
    Non-personal, includes the topic and homework of the lesson.
    """
    week = models.IntegerField()
+    year = models.IntegerField(verbose_name=_("Year"), default=get_current_year)
    lesson_period = models.ForeignKey(
        "chronos.LessonPeriod", models.CASCADE, related_name="documentations"
    )
    topic = models.CharField(verbose_name=_("Lesson topic"), max_length=200, blank=True)
    homework = models.CharField(verbose_name=_("Homework"), max_length=200, blank=True)
+    group_note = models.CharField(
+        verbose_name=_("Group note"), max_length=200, blank=True
+    )
+    def _carry_over_data(self):
+        """Carry over data to directly adjacent periods in this lesson if data is not already set.
+        Can be deactivated using site preference ``alsijil__carry_over``.
+        """
+        following_periods = LessonPeriod.objects.filter(
+            lesson=self.lesson_period.lesson,
+            period__weekday=self.lesson_period.period.weekday,
+            period__period__gt=self.lesson_period.period.period,
+        )
+        for period in following_periods:
+            lesson_documentation = period.get_or_create_lesson_documentation(
+                CalendarWeek(week=self.week, year=self.year)
+            )
+            changed = False
+            if not lesson_documentation.topic:
+                lesson_documentation.topic = self.topic
+                changed = True
+            if not lesson_documentation.homework:
+                lesson_documentation.homework = self.homework
+                changed = True
+            if not lesson_documentation.group_note:
+                lesson_documentation.group_note = self.group_note
+                changed = True
+            if changed:
+                lesson_documentation.save()
+    def save(self, *args, **kwargs):
+        if get_site_preferences()["alsijil__carry_over"] and (
+            self.topic or self.homework or self.group_note
+        ):
+            self._carry_over_data()
+        super().save(*args, **kwargs)
    class Meta:
        verbose_name = _("Lesson documentation")
        verbose_name_plural = _("Lesson documentations")
        unique_together = [["lesson_period", "week"]]
        ordering = [
-            "lesson_period__lesson__validity__date_start",
+            "year",
            "week",
            "lesson_period__period__weekday",
            "lesson_period__period__period",
        ]
-class PersonalNoteFilter(ExtensibleModel):
+class ExtraMark(ExtensibleModel):
-    """A filter definition that can generate statistics on personal note texts."""
+    """A model for extra marks.
-    identifier = models.CharField(
+    Can be used for lesson-based counting of things (like forgotten homework).
-        verbose_name=_("Identifier"),
+    """
-        max_length=30,
-        validators=[isidentifier],
-        unique=True,
-    )
-    description = models.CharField(
-        verbose_name=_("Description"), max_length=60, blank=True, unique=True
-    )
-    regex = models.CharField(
+    short_name = models.CharField(
-        verbose_name=_("Match expression"), max_length=100, unique=True
+        max_length=255, unique=True, verbose_name=_("Short name")
    )
+    name = models.CharField(max_length=255, unique=True, verbose_name=_("Name"))
+    def __str__(self):
+        return f"{self.name}"
+    @property
+    def count_label(self):
+        return f"{self.short_name}_count"
    class Meta:
-        verbose_name = _("Personal note filter")
+        ordering = ["short_name"]
-        verbose_name_plural = _("Personal note filters")
+        verbose_name = _("Extra mark")
-        ordering = ["identifier"]
+        verbose_name_plural = _("Extra marks")
--- a/aleksis/apps/alsijil/preferences.py
+++ b/aleksis/apps/alsijil/preferences.py
+from django.utils.translation import gettext as _
+from dynamic_preferences.preferences import Section
+from dynamic_preferences.types import BooleanPreference
+from aleksis.core.registries import site_preferences_registry
+alsijil = Section("alsijil", verbose_name=_("Class register"))
+@site_preferences_registry.register
+class BlockPersonalNotesForCancelled(BooleanPreference):
+    section = alsijil
+    name = "block_personal_notes_for_cancelled"
+    default = True
+    verbose_name = _("Block adding personal notes for cancelled lessons")
+@site_preferences_registry.register
+class CarryOverDataToNextPeriods(BooleanPreference):
+    section = alsijil
+    name = "carry_over"
+    default = True
+    verbose_name = _(
+        "Carry over data from first lesson period to the following lesson periods in lessons over multiple periods"
+    )
+    help_text = _(
+        "This will carry over data only if the data in the following periods are empty."
+    )
+@site_preferences_registry.register
+class AllowOpenPeriodsOnSameDay(BooleanPreference):
+    section = alsijil
+    name = "open_periods_same_day"
+    default = False
+    verbose_name = _(
+        "Allow teachers to open lesson periods on the same day and not just at the beginning of the period"
+    )
+    help_text = _(
+        "Lessons in the past are not affected by this setting, you can open them whenever you want."
+    )
--- a/aleksis/apps/alsijil/static/css/alsijil/lesson.css
+++ b/aleksis/apps/alsijil/static/css/alsijil/lesson.css
+.alsijil-check-box {
+    margin-right: 10px;
+}
+.alsijil-check-box [type="checkbox"] {
+    padding-left: 30px;
+}
 .alsijil-lesson-cancelled {
    text-decoration: line-through;
 }

--- a/aleksis/apps/alsijil/tables.py
+++ b/aleksis/apps/alsijil/tables.py
@@ -4,18 +4,23 @@ import django_tables2 as tables
 from django_tables2.utils import A
-class PersonalNoteFilterTable(tables.Table):
+class ExtraMarkTable(tables.Table):
    class Meta:
        attrs = {"class": "highlight"}
-    identifier = tables.Column()
+    name = tables.LinkColumn("edit_extra_mark", args=[A("id")])
-    description = tables.Column()
+    short_name = tables.Column()
-    regex = tables.Column()
+    edit = tables.LinkColumn(
-    edit_filter = tables.LinkColumn(
+        "edit_extra_mark",
-        "edit_personal_note_filter",
        args=[A("id")],
        text=_("Edit"),
-        attrs={"a": {"class": "btn-flat waves-effect waves-orange"}},
+        attrs={"a": {"class": "btn-flat waves-effect waves-orange orange-text"}},
+    )
+    delete = tables.LinkColumn(
+        "delete_extra_mark",
+        args=[A("id")],
+        text=_("Delete"),
+        attrs={"a": {"class": "btn-flat waves-effect waves-red red-text"}},
    )

--- a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
 {# -*- engine:django -*- #}
 {% extends "core/base.html" %}
-{% load week_helpers %}
+{% load week_helpers material_form_internal %}
 {% load material_form i18n static %}
 {% block browser_title %}{% blocktrans %}Lesson{% endblocktrans %}{% endblock %}
@@ -50,17 +50,29 @@
  </div>
  <form method="post">
+    <p>{% include "core/partials/save_button.html" %}</p>
+    {% csrf_token %}
    <div class="row">
      <div class="col s12">
-        {% include "core/partials/save_button.html" %}
+        <ul class="tabs">
+          <li class="tab">
+            <a href="#lesson-documentation">{% trans "Lesson documentation" %}</a>
+          </li>
+          {% if not lesson_period.get_substitution.cancelled or not request.site.preferences.alsijil__block_personal_notes_for_cancelled %}
+            <li class="tab">
+              <a href="#personal-notes">{% trans "Personal notes" %}</a>
+            </li>
+          {% endif %}
+          <li class="tab">
+            <a href="#version-history">{% trans "Change history" %}</a>
+          </li>
+        </ul>
      </div>
-    </div>
-    {% csrf_token %}
-    <div class="row">
+      <div class="col s12" id="lesson-documentation">
-      <div class="col s12 m12 l6 xl8">
        {% with prev_lesson=lesson_period.prev prev_doc=prev_lesson.get_lesson_documentation %}
-          {% with prev_doc=prev_lesson.get_lesson_documentation absences=prev_lesson.get_absences tardinesses=prev_lesson.get_tardinesses %}
+          {% with prev_doc=prev_lesson.get_lesson_documentation absences=prev_lesson.get_absences tardinesses=prev_lesson.get_tardinesses extra_marks=prev_lesson.get_extra_marks %}
            {% if prev_doc %}
              {% weekday_to_date prev_lesson.week prev_lesson.period.weekday as prev_date %}
@@ -86,6 +98,13 @@
                      </tr>
                    {% endif %}
+                    {% if prev_doc.group_note %}
+                      <tr>
+                        <th class="collection-item">{% trans "Group notes for previous lesson:" %}</th>
+                        <td>{{ prev_doc.group_note }}</td>
+                      </tr>
+                    {% endif %}
                    {% if absences %}
                      <tr>
                        <th>{% trans "Absent persons:" %}</th>
@@ -99,6 +118,18 @@
                        <td>{% include "alsijil/partials/tardinesses.html" with notes=tardinesses %}</td>
                      </tr>
                    {% endif %}
+                    {% for extra_mark, notes in extra_marks.items %}
+                      <tr>
+                        <th>{{ extra_mark.name }}</th>
+                        <td>
+                          {% for note in notes %}
+                            <span>{{ note.person }}{% if not forloop.last %},{% endif %}</span>
+                          {% endfor %}
+                        </td>
+                      </tr>
+                    {% endfor %}
                  </table>
                </div>
              </div>
@@ -116,92 +147,113 @@
          </div>
        </div>
      </div>
-      <div class="col s12 m12 l6 xl4">
-        <div class="card">
-          <div class="card-content">
-          <span class="card-title">
-            {% blocktrans %}Change history{% endblocktrans %}
-          </span>
-            {% include 'core/partials/crud_events.html' with obj=lesson_documentation %}
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="row">
+      {% if not lesson_period.get_substitution.cancelled or not request.site.preferences.alsijil__block_personal_notes_for_cancelled %}
-      <div class="col s12">
+        <div class="col s12" id="personal-notes">
-        <div class="card">
+          <div class="card">
-          <div class="card-content">
+            <div class="card-content">
      <span class="card-title">
        {% blocktrans %}Personal notes{% endblocktrans %}
      </span>
-            {% form form=personal_note_formset.management_form %}{% endform %}
+              {% form form=personal_note_formset.management_form %}{% endform %}
-            <table class="striped responsive-table alsijil-table">
+              <table class="striped responsive-table alsijil-table">
-              <thead>
+                <thead>
-              <tr>
-                <th>{% blocktrans %}Person{% endblocktrans %}</th>
-                <th>{% blocktrans %}Absent{% endblocktrans %}</th>
-                <th>{% blocktrans %}Tardiness{% endblocktrans %}</th>
-                <th>{% blocktrans %}Excused{% endblocktrans %}</th>
-                <th>{% blocktrans %}Excuse type{% endblocktrans %}</th>
-                <th>{% blocktrans %}Remarks{% endblocktrans %}</th>
-              </tr>
-              </thead>
-              <tbody>
-              {% for form in personal_note_formset %}
                <tr>
-                  {{ form.id }}
+                  <th>{% blocktrans %}Person{% endblocktrans %}</th>
-                  <td>{{ form.person_name }}{{ form.person_name.value }}</td>
+                  <th>{% blocktrans %}Absent{% endblocktrans %}</th>
-                  <td class="center-align">
+                  <th>{% blocktrans %}Tardiness{% endblocktrans %}</th>
-                    <label>
+                  <th>{% blocktrans %}Excused{% endblocktrans %}</th>
-                      {{ form.absent }}
+                  <th>{% blocktrans %}Excuse type{% endblocktrans %}</th>
-                      <span></span>
+                  <th>{% blocktrans %}Extra marks{% endblocktrans %}</th>
-                    </label>
-                  </td>
+                  <th>{% blocktrans %}Remarks{% endblocktrans %}</th>
-                  <td>
+                </tr>
-                    <div class="input-field">
+                </thead>
-                      {{ form.late }}
+                <tbody>
-                      <label for="{{ form.absent.id_for_label }}">
+                {% for form in personal_note_formset %}
-                        {% trans "Tardiness (in m)" %}
+                  <tr>
-                      </label>
+                    {{ form.id }}
-                    </div>
+                    <td>{{ form.person_name }}{{ form.person_name.value }}</td>
-                  </td>
+                    <td class="center-align">
-                  <td class="center-align">
+                      <label>
-                    <label>
+                        {{ form.absent }}
-                      {{ form.excused }}
+                        <span></span>
-                      <span></span>
-                    </label>
-                  </td>
-                  <td>
-                    <div class="input-field">
-                      {{ form.excuse_type }}
-                      <label for="{{ form.excuse_type.id_for_label }}">
-                        {% trans "Excuse type" %}
                      </label>
-                    </div>
+                    </td>
-                  </td>
+                    <td>
-                  <td>
+                      <div class="input-field">
-                    <div class="input-field">
+                        {{ form.late }}
-                      {{ form.remarks }}
+                        <label for="{{ form.absent.id_for_label }}">
-                      <label for="{{ form.absent.id_for_label }}">
+                          {% trans "Tardiness (in m)" %}
-                        {% trans "Remarks" %}
+                        </label>
+                      </div>
+                    </td>
+                    <td class="center-align">
+                      <label>
+                        {{ form.excused }}
+                        <span></span>
                      </label>
-                    </div>
+                    </td>
-                  </td>
+                    <td>
-                </tr>
+                      <div class="input-field">
-              {% endfor %}
+                        {{ form.excuse_type }}
-              </tbody>
+                        <label for="{{ form.excuse_type.id_for_label }}">
-            </table>
+                          {% trans "Excuse type" %}
+                        </label>
+                      </div>
+                    </td>
+                    <td>
+                      {% for group, items in form.extra_marks|select_options %}
+                        {% for choice, value, selected in items %}
+                          <label class="{% if selected %} active{% endif %} alsijil-check-box">
+                            <input type="checkbox"
+                                   {% if value == None or value == '' %}disabled{% else %}value="{{ value }}"{% endif %}
+                                    {% if selected %} checked="checked"{% endif %}
+                                   name="{{ form.extra_marks.html_name }}">
+                            <span>{{ choice }}</span>
+                          </label>
+                        {% endfor %}
+                      {% endfor %}
+                    </td>
+                    <td>
+                      <div class="input-field">
+                        {{ form.remarks }}
+                        <label for="{{ form.absent.id_for_label }}">
+                          {% trans "Remarks" %}
+                        </label>
+                      </div>
+                    </td>
+                    <td>
+                      <div class="input-field">
+                        {{ form.remarks }}
+                        <label for="{{ form.absent.id_for_label }}">
+                          {% trans "Remarks" %}
+                        </label>
+                      </div>
+                    </td>
+                  </tr>
+                {% endfor %}
+                </tbody>
+              </table>
+            </div>
          </div>
        </div>
-      </div>
-    </div>
-    <div class="row">
+      {% endif %}
-      <div class="col s12">
-        {% include "core/partials/save_button.html" %}
+      <div class="col s12" id="version-history">
+        <div class="card">
+          <div class="card-content">
+          <span class="card-title">
+            {% blocktrans %}Change history{% endblocktrans %}
+          </span>
+            {% include 'core/partials/crud_events.html' with obj=lesson_documentation %}
+          </div>
+        </div>
      </div>
    </div>
+    <p>{% include "core/partials/save_button.html" %}</p>
  </form>
 {% endblock %}
No results found