diff --git a/aleksis/apps/chronos/locale/ar/LC_MESSAGES/django.po b/aleksis/apps/chronos/locale/ar/LC_MESSAGES/django.po
index e58e5abfe555ff77cc0b2d8dd6f04c317fc23fcb..7bfa932f4f871a7787fc4f238c190419a4f07021 100644
--- a/aleksis/apps/chronos/locale/ar/LC_MESSAGES/django.po
+++ b/aleksis/apps/chronos/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: 2022-06-21 11:32+0200\n"
+"POT-Creation-Date: 2024-08-18 14:23+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"
@@ -18,76 +18,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "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"
 
-#: aleksis/apps/chronos/form_extensions.py:7
-msgid "Options for timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/form_extensions.py:8
-msgid "Optional data for timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:6 aleksis/apps/chronos/preferences.py:10
-msgid "Timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:16
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:11
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:18
-msgid "My timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:27
-#: aleksis/apps/chronos/templates/chronos/all.html:11
-#: aleksis/apps/chronos/templates/chronos/all.html:12
-msgid "All timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:38
-msgid "Daily lessons"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:49
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:11
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:17
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:12
-msgid "Substitutions"
-msgstr ""
-
 #: aleksis/apps/chronos/mixins.py:25
 msgid "Linked validity range"
 msgstr ""
 
-#: aleksis/apps/chronos/model_extensions.py:142
-msgid "Show announcement in timetable views?"
-msgstr ""
-
-#: aleksis/apps/chronos/model_extensions.py:151
+#: aleksis/apps/chronos/model_extensions.py:145
 msgid "Can view group timetable"
 msgstr ""
 
-#: aleksis/apps/chronos/model_extensions.py:155
+#: aleksis/apps/chronos/model_extensions.py:149
 msgid "Can view person timetable"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:86
+#: aleksis/apps/chronos/models.py:87
 msgid "School term"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:89 aleksis/apps/chronos/models.py:699
+#: aleksis/apps/chronos/models.py:90 aleksis/apps/chronos/models.py:626
+#: aleksis/apps/chronos/models.py:1310
 msgid "Name"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:91 aleksis/apps/chronos/models.py:754
-#: aleksis/apps/chronos/models.py:827 aleksis/apps/chronos/models.py:1061
+#: aleksis/apps/chronos/models.py:92 aleksis/apps/chronos/models.py:676
+#: aleksis/apps/chronos/models.py:747 aleksis/apps/chronos/models.py:979
 msgid "Start date"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:92 aleksis/apps/chronos/models.py:755
-#: aleksis/apps/chronos/models.py:828 aleksis/apps/chronos/models.py:1062
+#: aleksis/apps/chronos/models.py:93 aleksis/apps/chronos/models.py:677
+#: aleksis/apps/chronos/models.py:748 aleksis/apps/chronos/models.py:980
 msgid "End date"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:111
+#: aleksis/apps/chronos/models.py:112
 msgid "The start date must be earlier than the end date."
 msgstr ""
 
@@ -107,547 +69,506 @@ msgstr ""
 msgid "Validity ranges"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:150
+#: aleksis/apps/chronos/models.py:149
 msgid "Week day"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:152
+#: aleksis/apps/chronos/models.py:151
 msgid "Number of period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:154
+#: aleksis/apps/chronos/models.py:153
 msgid "Start time"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:155
+#: aleksis/apps/chronos/models.py:154
 msgid "End time"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:338 aleksis/apps/chronos/models.py:525
-#: aleksis/apps/chronos/models.py:1191
+#: aleksis/apps/chronos/models.py:324 aleksis/apps/chronos/models.py:496
+#: aleksis/apps/chronos/models.py:1122
 msgid "Time period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:339
+#: aleksis/apps/chronos/models.py:325
 msgid "Time periods"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:343 aleksis/apps/chronos/models.py:364
-#: aleksis/apps/chronos/models.py:698 aleksis/apps/chronos/models.py:873
-#: aleksis/apps/chronos/models.py:895
+#: aleksis/apps/chronos/models.py:329 aleksis/apps/chronos/models.py:625
+#: aleksis/apps/chronos/models.py:793 aleksis/apps/chronos/models.py:810
 msgid "Short name"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:344 aleksis/apps/chronos/models.py:365
-#: aleksis/apps/chronos/models.py:874 aleksis/apps/chronos/models.py:896
+#: aleksis/apps/chronos/models.py:330 aleksis/apps/chronos/models.py:794
+#: aleksis/apps/chronos/models.py:811
 msgid "Long name"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:346
+#: aleksis/apps/chronos/models.py:332
 msgid "Foreground colour"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:347
+#: aleksis/apps/chronos/models.py:333
 msgid "Background colour"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:354 aleksis/apps/chronos/models.py:390
-#: aleksis/apps/chronos/models.py:446 aleksis/apps/chronos/models.py:1198
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
+#: aleksis/apps/chronos/models.py:340 aleksis/apps/chronos/models.py:349
+#: aleksis/apps/chronos/models.py:416 aleksis/apps/chronos/models.py:1129
+#: aleksis/apps/chronos/models.py:1345
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:2
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:29
 msgid "Subject"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:355
+#: aleksis/apps/chronos/models.py:341
 msgid "Subjects"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:374
-msgid "Can view room timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:376 aleksis/apps/chronos/models.py:454
-#: aleksis/apps/chronos/models.py:533 aleksis/apps/chronos/models.py:751
-#: aleksis/apps/chronos/models.py:1213
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
-msgid "Room"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:377 aleksis/apps/chronos/models.py:1078
-#: aleksis/apps/chronos/templates/chronos/all.html:45
-msgid "Rooms"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:393 aleksis/apps/chronos/models.py:452
-#: aleksis/apps/chronos/models.py:1080 aleksis/apps/chronos/models.py:1206
-#: aleksis/apps/chronos/tables.py:35
-#: aleksis/apps/chronos/templates/chronos/all.html:17
+#: aleksis/apps/chronos/models.py:352 aleksis/apps/chronos/models.py:422
+#: aleksis/apps/chronos/models.py:998 aleksis/apps/chronos/models.py:1137
+#: aleksis/apps/chronos/models.py:1338
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:3
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:28
+#: aleksis/apps/chronos/templates/chronos/supervision_event_description.txt:1
 msgid "Teachers"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:399
+#: aleksis/apps/chronos/models.py:358
 msgid "Periods"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:401 aleksis/apps/chronos/models.py:1077
-#: aleksis/apps/chronos/models.py:1201 aleksis/apps/chronos/tables.py:34
-#: aleksis/apps/chronos/templates/chronos/all.html:31
+#: aleksis/apps/chronos/models.py:360 aleksis/apps/chronos/models.py:995
+#: aleksis/apps/chronos/models.py:1132 aleksis/apps/chronos/models.py:1326
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:1
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:26
 msgid "Groups"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:424 aleksis/apps/chronos/models.py:519
-#: aleksis/apps/chronos/models.py:795
+#: aleksis/apps/chronos/models.py:394 aleksis/apps/chronos/models.py:490
+#: aleksis/apps/chronos/models.py:716 aleksis/apps/chronos/models.py:1430
+#: aleksis/apps/chronos/models.py:1454
 msgid "Lesson"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:425
-#: aleksis/apps/chronos/templates/chronos/lessons_day.html:9
-#: aleksis/apps/chronos/templates/chronos/lessons_day.html:19
+#: aleksis/apps/chronos/models.py:395 aleksis/apps/chronos/models.py:1306
 msgid "Lessons"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:433 aleksis/apps/chronos/models.py:1185
+#: aleksis/apps/chronos/models.py:403 aleksis/apps/chronos/models.py:1116
 msgid "Week"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:434 aleksis/apps/chronos/models.py:1186
+#: aleksis/apps/chronos/models.py:404 aleksis/apps/chronos/models.py:1117
 msgid "Year"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:437 aleksis/apps/chronos/models.py:654
+#: aleksis/apps/chronos/models.py:407 aleksis/apps/chronos/models.py:620
 msgid "Lesson period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:456
+#: aleksis/apps/chronos/models.py:425 aleksis/apps/chronos/models.py:504
+#: aleksis/apps/chronos/models.py:673 aleksis/apps/chronos/models.py:1144
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
+msgid "Room"
+msgstr ""
+
+#: aleksis/apps/chronos/models.py:428
 msgid "Cancelled?"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:458
+#: aleksis/apps/chronos/models.py:430
 msgid "Cancelled for teachers?"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:461 aleksis/apps/chronos/models.py:770
-#: aleksis/apps/chronos/models.py:813 aleksis/apps/chronos/models.py:1216
+#: aleksis/apps/chronos/models.py:433 aleksis/apps/chronos/models.py:692
+#: aleksis/apps/chronos/models.py:734 aleksis/apps/chronos/models.py:1147
+#: aleksis/apps/chronos/models.py:1357
 msgid "Comment"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:465
+#: aleksis/apps/chronos/models.py:437
 msgid "Lessons can only be either substituted or cancelled."
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:506
+#: aleksis/apps/chronos/models.py:477
 msgid "Lesson substitution"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:507
+#: aleksis/apps/chronos/models.py:478
 msgid "Lesson substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:655
+#: aleksis/apps/chronos/models.py:621
 msgid "Lesson periods"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:693
-msgid "Timetable widget"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:694
-msgid "Timetable widgets"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:708 aleksis/apps/chronos/models.py:726
+#: aleksis/apps/chronos/models.py:635 aleksis/apps/chronos/models.py:648
 msgid "Absence reason"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:709
+#: aleksis/apps/chronos/models.py:636
 msgid "Absence reasons"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:735 aleksis/apps/chronos/models.py:974
-#: aleksis/apps/chronos/models.py:1025
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
+#: aleksis/apps/chronos/models.py:657 aleksis/apps/chronos/models.py:889
+#: aleksis/apps/chronos/models.py:943
 msgid "Teacher"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:743
+#: aleksis/apps/chronos/models.py:665
 msgid "Group"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:759 aleksis/apps/chronos/models.py:802
+#: aleksis/apps/chronos/models.py:681 aleksis/apps/chronos/models.py:723
 msgid "Start period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:766 aleksis/apps/chronos/models.py:808
+#: aleksis/apps/chronos/models.py:688 aleksis/apps/chronos/models.py:729
 msgid "End period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:780
+#: aleksis/apps/chronos/models.py:702
 msgid "Unknown absence"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:786
+#: aleksis/apps/chronos/models.py:707
 msgid "Absence"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:787
+#: aleksis/apps/chronos/models.py:708
 msgid "Absences"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:798
+#: aleksis/apps/chronos/models.py:719
 msgid "Date of exam"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:812 aleksis/apps/chronos/models.py:826
-#: aleksis/apps/chronos/models.py:1059
+#: aleksis/apps/chronos/models.py:733 aleksis/apps/chronos/models.py:746
+#: aleksis/apps/chronos/models.py:977
 msgid "Title"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:819
+#: aleksis/apps/chronos/models.py:739
 msgid "Exam"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:820
+#: aleksis/apps/chronos/models.py:740
 msgid "Exams"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:829
+#: aleksis/apps/chronos/models.py:749
 msgid "Comments"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:868
+#: aleksis/apps/chronos/models.py:788
 msgid "Holiday"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:869
+#: aleksis/apps/chronos/models.py:789
 msgid "Holidays"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:883 aleksis/apps/chronos/models.py:964
+#: aleksis/apps/chronos/models.py:803 aleksis/apps/chronos/models.py:879
 msgid "Supervision area"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:884
+#: aleksis/apps/chronos/models.py:804
 msgid "Supervision areas"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:901
+#: aleksis/apps/chronos/models.py:816
 msgid "Time period after break starts"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:909
+#: aleksis/apps/chronos/models.py:824
 msgid "Time period before break ends"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:949 aleksis/apps/chronos/models.py:968
+#: aleksis/apps/chronos/models.py:864 aleksis/apps/chronos/models.py:883
 msgid "Break"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:950
+#: aleksis/apps/chronos/models.py:865
 msgid "Breaks"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1005 aleksis/apps/chronos/models.py:1018
-#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:23
-#: aleksis/apps/chronos/templates/chronos/partials/supervision.html:15
+#: aleksis/apps/chronos/models.py:923 aleksis/apps/chronos/models.py:936
+#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:3
 msgid "Supervision"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1006
+#: aleksis/apps/chronos/models.py:924 aleksis/apps/chronos/models.py:1622
 msgid "Supervisions"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1014
+#: aleksis/apps/chronos/models.py:932
 msgid "Date"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1048
+#: aleksis/apps/chronos/models.py:966
 msgid "Supervision substitution"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1049
+#: aleksis/apps/chronos/models.py:967
 msgid "Supervision substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1067
+#: aleksis/apps/chronos/models.py:985
 msgid "Start time period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1073
+#: aleksis/apps/chronos/models.py:991
 msgid "End time period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1087
+#: aleksis/apps/chronos/models.py:996 aleksis/apps/chronos/models.py:1332
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:4
+msgid "Rooms"
+msgstr ""
+
+#: aleksis/apps/chronos/models.py:1005
 #, python-brace-format
 msgid "Event {pk}"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1172
-#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:27
+#: aleksis/apps/chronos/models.py:1103
 msgid "Event"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1173
+#: aleksis/apps/chronos/models.py:1104
 msgid "Events"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1221
+#: aleksis/apps/chronos/models.py:1152
 msgid "Related exam"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1251
+#: aleksis/apps/chronos/models.py:1181
 msgid "Extra lesson"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1252
+#: aleksis/apps/chronos/models.py:1182
 msgid "Extra lessons"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1264
+#: aleksis/apps/chronos/models.py:1194
 msgid "Number of days shown in the plan"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1268
+#: aleksis/apps/chronos/models.py:1198
 msgid "Show header box"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1269 aleksis/apps/chronos/preferences.py:61
+#: aleksis/apps/chronos/models.py:1199 aleksis/apps/chronos/preferences.py:100
 msgid "The header box shows affected teachers/groups."
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1276
+#: aleksis/apps/chronos/models.py:1206
 msgid "Revision which triggered the last update"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1337
+#: aleksis/apps/chronos/models.py:1278
 msgid "Automatic plan"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1338
+#: aleksis/apps/chronos/models.py:1279
 msgid "Automatic plans"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1352
+#: aleksis/apps/chronos/models.py:1293
 msgid "Can view all room timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1353
+#: aleksis/apps/chronos/models.py:1294
 msgid "Can view all group timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1354
+#: aleksis/apps/chronos/models.py:1295
 msgid "Can view all person timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1355
+#: aleksis/apps/chronos/models.py:1296
 msgid "Can view timetable overview"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1356
+#: aleksis/apps/chronos/models.py:1297
 msgid "Can view all lessons per day"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:18
-msgid "Use parent groups in timetable views"
+#: aleksis/apps/chronos/models.py:1298
+msgid "Can view all supervisions per day"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:20
-msgid "If an lesson or substitution has only one group and this group has parent groups, show the parent groups instead of the original group."
+#: aleksis/apps/chronos/models.py:1313
+msgid "Start slot number"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:31
-msgid "Shorten groups in timetable views"
+#: aleksis/apps/chronos/models.py:1316
+msgid "End slot number"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:32
-msgid "If there are more groups than the set limit, they will be collapsed."
+#: aleksis/apps/chronos/models.py:1320
+msgid "Course"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:40
-msgid "Limit of groups for shortening of groups"
+#: aleksis/apps/chronos/models.py:1353
+#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:4
+msgid "Cancelled"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:42
-msgid "If an user activates shortening of groups,they will be collapsed if there are more groups than this limit."
+#: aleksis/apps/chronos/models.py:1401 aleksis/apps/chronos/models.py:1413
+#: aleksis/apps/chronos/models.py:1425
+msgid "{} (instead of {})"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:52
-msgid "Number of days shown on substitutions print view"
+#: aleksis/apps/chronos/models.py:1614
+msgid "Lesson Event"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:60
-msgid "Show header box in substitution views"
+#: aleksis/apps/chronos/models.py:1615
+msgid "Lesson Events"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:70
-msgid "Show parent groups in header box in substitution views instead of original groups"
+#: aleksis/apps/chronos/models.py:1630
+msgid "Supervision: {}"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:79
-msgid "How many days in advance users should be notified about timetable changes?"
+#: aleksis/apps/chronos/preferences.py:21
+msgid "Timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:87
-msgid "Time for sending notifications about timetable changes"
+#: aleksis/apps/chronos/preferences.py:29
+msgid "Use parent groups in timetable views"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:90
-msgid "This is only used for scheduling notifications which doesn't affect the time period configured above. All other notifications affecting the next days are sent immediately."
+#: aleksis/apps/chronos/preferences.py:31
+msgid "If a lesson or substitution has only one group and this group has parent groups, show the parent groups instead of the original group."
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:101
-#: aleksis/apps/chronos/preferences.py:109
-msgid "Send notifications for current timetable changes"
+#: aleksis/apps/chronos/preferences.py:42
+msgid "Shorten groups in timetable views"
 msgstr ""
 
-#: aleksis/apps/chronos/tables.py:41
-msgid "Substitution"
+#: aleksis/apps/chronos/preferences.py:43
+msgid "If there are more groups than the set limit, they will be collapsed."
 msgstr ""
 
-#: aleksis/apps/chronos/tables.py:43
-msgid "Manage substitution"
+#: aleksis/apps/chronos/preferences.py:51
+msgid "Limit of groups for shortening of groups"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/all.html:25
-msgid "No teachers timetables available."
+#: aleksis/apps/chronos/preferences.py:53
+msgid "If a user activates shortening of groups,they will be collapsed if there are more groups than this limit."
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/all.html:39
-msgid "No group timetables available."
+#: aleksis/apps/chronos/preferences.py:65
+msgid "Relevant days for substitution plans"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/all.html:53
-msgid "No room timetables available."
+#: aleksis/apps/chronos/preferences.py:82
+msgid "Time when substitution plans switch to the next day"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:11
-msgid "Edit substitution."
+#: aleksis/apps/chronos/preferences.py:91
+msgid "Number of days shown on substitutions print view"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:12
-msgid "Edit substitution"
+#: aleksis/apps/chronos/preferences.py:99
+msgid "Show header box in substitution views"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:25
-msgid "Delete"
+#: aleksis/apps/chronos/preferences.py:109
+msgid "Show parent groups in header box in substitution views instead of original groups"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:19
-#: aleksis/apps/chronos/templates/chronos/timetable.html:50
-msgid "SMART PLAN"
+#: aleksis/apps/chronos/preferences.py:118
+msgid "How many days in advance users should be notified about timetable changes?"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:22
-msgid "Show week timetable for"
+#: aleksis/apps/chronos/preferences.py:126
+msgid "Time for sending notifications about timetable changes"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:10
-msgid "Absent teachers"
+#: aleksis/apps/chronos/preferences.py:129
+msgid "This is only used for scheduling notifications which doesn't affect the time period configured above. All other notifications affecting the next days are sent immediately."
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:22
-msgid "Absent groups"
+#: aleksis/apps/chronos/preferences.py:140
+#: aleksis/apps/chronos/preferences.py:148
+msgid "Send notifications for current timetable changes"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:34
-msgid "Affected teachers"
+#: aleksis/apps/chronos/preferences.py:158
+msgid "Group types to show in timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:46
-msgid "Affected groups"
+#: aleksis/apps/chronos/preferences.py:159
+msgid "If you leave it empty, all groups will be shown."
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/lesson.html:27
-msgid "Cancelled due to an event"
+#: aleksis/apps/chronos/preferences.py:169
+msgid "Lesson calendar feed color"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:4
-msgid "Cancelled"
+#: aleksis/apps/chronos/preferences.py:181
+msgid "Supervision calendar feed color"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:6
-msgid "Cancelled for teachers"
+#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:10
+msgid "Absent teachers"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/today.html:2
-msgid "Today"
+#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:22
+msgid "Absent groups"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:14
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:25
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:36
-msgid "CW"
+#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:34
+msgid "Affected teachers"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:49
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:31
-msgid "Notes"
+#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:46
+msgid "Affected groups"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:57
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:41
-msgid "No substitutions available."
+#: aleksis/apps/chronos/templates/chronos/partials/subs/period.html:12
+msgid "all day"
 msgstr ""
 
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:11
 msgid "Print: Substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/timetable.html:11
-#: aleksis/apps/chronos/templates/chronos/timetable.html:24
-#: aleksis/apps/chronos/templates/chronos/timetable_print.html:11
-#: aleksis/apps/chronos/util/notifications.py:206
-msgid "Timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:29
-msgid "Group teachers:"
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:55
-msgid "Show regular timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:63
-#: aleksis/apps/chronos/templates/chronos/timetable.html:84
-msgid "View class register of this week"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:12
+msgid "Substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/timetable.html:76
-msgid "Show SMART PLAN"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:27
+msgid "Time"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/widget.html:8
-#, python-format
-msgid ""
-"\n"
-"        My timetable for %(day)s\n"
-"      "
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:31
+msgid "Notes"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/widget.html:18
-msgid ""
-"\n"
-"          There is no timetable linked to your person.\n"
-"          "
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:41
+msgid "No substitutions available."
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/widget.html:27
-msgid "Go to smart plan"
+#: aleksis/apps/chronos/templates/chronos/supervision_event_description.txt:2
+msgid "Areas"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:50
+#: aleksis/apps/chronos/util/notifications.py:48
 #, python-brace-format
 msgid "The {subject} lesson in the {period}. period on {day} has been cancelled."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:57
+#: aleksis/apps/chronos/util/notifications.py:55
 #, python-brace-format
 msgid "The {subject} lesson in the {period}. period on {day} has some current changes."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:66
+#: aleksis/apps/chronos/util/notifications.py:64
 #, python-brace-format
 msgid "The teacher {old} is substituted by {new}."
 msgid_plural "The teachers {old} are substituted by {new}."
@@ -658,81 +579,77 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: aleksis/apps/chronos/util/notifications.py:78
+#: aleksis/apps/chronos/util/notifications.py:76
 #, python-brace-format
 msgid "The subject is changed to {subject}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:84
+#: aleksis/apps/chronos/util/notifications.py:82
 #, python-brace-format
 msgid "The lesson is moved from {old} to {new}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:93
+#: aleksis/apps/chronos/util/notifications.py:91
 #, python-brace-format
 msgid "There is an additional comment: {comment}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:101
+#: aleksis/apps/chronos/util/notifications.py:99
 #, python-brace-format
 msgid "There is an event that starts on {date_start}, {period_from}. period and ends on {date_end}, {period_to}. period:"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:114
+#: aleksis/apps/chronos/util/notifications.py:112
 #, python-brace-format
 msgid "There is an event on {date} from the {period_from}. period to the {period_to}. period:"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:125
-#: aleksis/apps/chronos/util/notifications.py:145
+#: aleksis/apps/chronos/util/notifications.py:123
+#: aleksis/apps/chronos/util/notifications.py:143
 #, python-brace-format
 msgid "Groups: {groups}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:127
-#: aleksis/apps/chronos/util/notifications.py:149
+#: aleksis/apps/chronos/util/notifications.py:125
+#: aleksis/apps/chronos/util/notifications.py:147
 #, python-brace-format
 msgid "Teachers: {teachers}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:130
+#: aleksis/apps/chronos/util/notifications.py:128
 #, python-brace-format
 msgid "Rooms: {rooms}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:137
+#: aleksis/apps/chronos/util/notifications.py:135
 #, python-brace-format
 msgid "There is an extra lesson on {date} in the {period}. period:"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:147
+#: aleksis/apps/chronos/util/notifications.py:145
 #, python-brace-format
 msgid "Subject: {subject}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:151
+#: aleksis/apps/chronos/util/notifications.py:149
 #, python-brace-format
 msgid "Room: {room}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:153
+#: aleksis/apps/chronos/util/notifications.py:151
 #, python-brace-format
 msgid "Comment: {comment}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:156
+#: aleksis/apps/chronos/util/notifications.py:154
 #, python-brace-format
 msgid "The supervision of {old} on {date} between the {period_from}. period and the {period_to}. period in the area {area} is substituted by {new}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:207
-msgid "There are current changes to your timetable."
-msgstr ""
-
-#: aleksis/apps/chronos/views.py:270
-msgid "The substitution has been saved."
+#: aleksis/apps/chronos/util/notifications.py:204
+msgid "Timetable"
 msgstr ""
 
-#: aleksis/apps/chronos/views.py:291
-msgid "The substitution has been deleted."
+#: aleksis/apps/chronos/util/notifications.py:205
+msgid "There are current changes to your timetable."
 msgstr ""
diff --git a/aleksis/apps/chronos/locale/de_DE/LC_MESSAGES/django.po b/aleksis/apps/chronos/locale/de_DE/LC_MESSAGES/django.po
index 7d60974cc959b0b54c7f753f2eb40b1404e13f6f..bb0175b705ae309551c35631e0445c8e6ef2e2f5 100644
--- a/aleksis/apps/chronos/locale/de_DE/LC_MESSAGES/django.po
+++ b/aleksis/apps/chronos/locale/de_DE/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-06-21 11:32+0200\n"
+"POT-Creation-Date: 2024-08-18 14:23+0200\n"
 "PO-Revision-Date: 2023-01-25 05:57+0000\n"
 "Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
 "Language-Team: German <https://translate.edugit.org/projects/aleksis/aleksis-app-chronos/de/>\n"
@@ -18,76 +18,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.12.1\n"
 
-#: aleksis/apps/chronos/form_extensions.py:7
-msgid "Options for timetables"
-msgstr "Einstellungen fÃ¼r StundenplÃ¤ne"
-
-#: aleksis/apps/chronos/form_extensions.py:8
-msgid "Optional data for timetables"
-msgstr "Optionale Daten fÃ¼r StundenplÃ¤ne"
-
-#: aleksis/apps/chronos/menus.py:6 aleksis/apps/chronos/preferences.py:10
-msgid "Timetables"
-msgstr "StundenplÃ¤ne"
-
-#: aleksis/apps/chronos/menus.py:16
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:11
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:18
-msgid "My timetable"
-msgstr "Mein Plan"
-
-#: aleksis/apps/chronos/menus.py:27
-#: aleksis/apps/chronos/templates/chronos/all.html:11
-#: aleksis/apps/chronos/templates/chronos/all.html:12
-msgid "All timetables"
-msgstr "Alle StundenplÃ¤ne"
-
-#: aleksis/apps/chronos/menus.py:38
-msgid "Daily lessons"
-msgstr "Tagesstunden"
-
-#: aleksis/apps/chronos/menus.py:49
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:11
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:17
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:12
-msgid "Substitutions"
-msgstr "Vertretungen"
-
 #: aleksis/apps/chronos/mixins.py:25
 msgid "Linked validity range"
 msgstr "Zugeordneter GÃ¼ltigkeitsbereich"
 
-#: aleksis/apps/chronos/model_extensions.py:142
-msgid "Show announcement in timetable views?"
-msgstr "AnkÃ¼ndigungen in Stundenplanansichten anzeigen?"
-
-#: aleksis/apps/chronos/model_extensions.py:151
+#: aleksis/apps/chronos/model_extensions.py:145
 msgid "Can view group timetable"
 msgstr "Kann GruppenstundenplÃ¤ne sehen"
 
-#: aleksis/apps/chronos/model_extensions.py:155
+#: aleksis/apps/chronos/model_extensions.py:149
 msgid "Can view person timetable"
 msgstr "Kann PersonenstundenplÃ¤ne sehen"
 
-#: aleksis/apps/chronos/models.py:86
+#: aleksis/apps/chronos/models.py:87
 msgid "School term"
 msgstr "Schuljahr"
 
-#: aleksis/apps/chronos/models.py:89 aleksis/apps/chronos/models.py:699
+#: aleksis/apps/chronos/models.py:90 aleksis/apps/chronos/models.py:626
+#: aleksis/apps/chronos/models.py:1310
 msgid "Name"
 msgstr "Name"
 
-#: aleksis/apps/chronos/models.py:91 aleksis/apps/chronos/models.py:754
-#: aleksis/apps/chronos/models.py:827 aleksis/apps/chronos/models.py:1061
+#: aleksis/apps/chronos/models.py:92 aleksis/apps/chronos/models.py:676
+#: aleksis/apps/chronos/models.py:747 aleksis/apps/chronos/models.py:979
 msgid "Start date"
 msgstr "Startdatum"
 
-#: aleksis/apps/chronos/models.py:92 aleksis/apps/chronos/models.py:755
-#: aleksis/apps/chronos/models.py:828 aleksis/apps/chronos/models.py:1062
+#: aleksis/apps/chronos/models.py:93 aleksis/apps/chronos/models.py:677
+#: aleksis/apps/chronos/models.py:748 aleksis/apps/chronos/models.py:980
 msgid "End date"
 msgstr "Enddatum"
 
-#: aleksis/apps/chronos/models.py:111
+#: aleksis/apps/chronos/models.py:112
 msgid "The start date must be earlier than the end date."
 msgstr "Das Startdatum muss vor dem Enddatum liegen."
 
@@ -107,440 +69,472 @@ msgstr "GÃ¼ltigkeitsbereich"
 msgid "Validity ranges"
 msgstr "GÃ¼ltigkeitsbereiche"
 
-#: aleksis/apps/chronos/models.py:150
+#: aleksis/apps/chronos/models.py:149
 msgid "Week day"
 msgstr "Wochentag"
 
-#: aleksis/apps/chronos/models.py:152
+#: aleksis/apps/chronos/models.py:151
 msgid "Number of period"
 msgstr "Nummer der Stunde"
 
-#: aleksis/apps/chronos/models.py:154
+#: aleksis/apps/chronos/models.py:153
 msgid "Start time"
 msgstr "Startzeit"
 
-#: aleksis/apps/chronos/models.py:155
+#: aleksis/apps/chronos/models.py:154
 msgid "End time"
 msgstr "Endzeit"
 
-#: aleksis/apps/chronos/models.py:338 aleksis/apps/chronos/models.py:525
-#: aleksis/apps/chronos/models.py:1191
+#: aleksis/apps/chronos/models.py:324 aleksis/apps/chronos/models.py:496
+#: aleksis/apps/chronos/models.py:1122
 msgid "Time period"
 msgstr "Stunde"
 
-#: aleksis/apps/chronos/models.py:339
+#: aleksis/apps/chronos/models.py:325
 msgid "Time periods"
 msgstr "Stunden"
 
-#: aleksis/apps/chronos/models.py:343 aleksis/apps/chronos/models.py:364
-#: aleksis/apps/chronos/models.py:698 aleksis/apps/chronos/models.py:873
-#: aleksis/apps/chronos/models.py:895
+#: aleksis/apps/chronos/models.py:329 aleksis/apps/chronos/models.py:625
+#: aleksis/apps/chronos/models.py:793 aleksis/apps/chronos/models.py:810
 msgid "Short name"
 msgstr "Kurzname"
 
-#: aleksis/apps/chronos/models.py:344 aleksis/apps/chronos/models.py:365
-#: aleksis/apps/chronos/models.py:874 aleksis/apps/chronos/models.py:896
+#: aleksis/apps/chronos/models.py:330 aleksis/apps/chronos/models.py:794
+#: aleksis/apps/chronos/models.py:811
 msgid "Long name"
 msgstr "Langname"
 
-#: aleksis/apps/chronos/models.py:346
+#: aleksis/apps/chronos/models.py:332
 msgid "Foreground colour"
 msgstr "Vordergrundfarbe"
 
-#: aleksis/apps/chronos/models.py:347
+#: aleksis/apps/chronos/models.py:333
 msgid "Background colour"
 msgstr "Hintergrundfarbe"
 
-#: aleksis/apps/chronos/models.py:354 aleksis/apps/chronos/models.py:390
-#: aleksis/apps/chronos/models.py:446 aleksis/apps/chronos/models.py:1198
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
+#: aleksis/apps/chronos/models.py:340 aleksis/apps/chronos/models.py:349
+#: aleksis/apps/chronos/models.py:416 aleksis/apps/chronos/models.py:1129
+#: aleksis/apps/chronos/models.py:1345
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:2
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:29
 msgid "Subject"
 msgstr "Fach"
 
-#: aleksis/apps/chronos/models.py:355
+#: aleksis/apps/chronos/models.py:341
 msgid "Subjects"
 msgstr "FÃ¤cher"
 
-#: aleksis/apps/chronos/models.py:374
-msgid "Can view room timetable"
-msgstr "Kann Raum-Stundenplan sehen"
-
-#: aleksis/apps/chronos/models.py:376 aleksis/apps/chronos/models.py:454
-#: aleksis/apps/chronos/models.py:533 aleksis/apps/chronos/models.py:751
-#: aleksis/apps/chronos/models.py:1213
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
-msgid "Room"
-msgstr "Raum"
-
-#: aleksis/apps/chronos/models.py:377 aleksis/apps/chronos/models.py:1078
-#: aleksis/apps/chronos/templates/chronos/all.html:45
-msgid "Rooms"
-msgstr "RÃ¤ume"
-
-#: aleksis/apps/chronos/models.py:393 aleksis/apps/chronos/models.py:452
-#: aleksis/apps/chronos/models.py:1080 aleksis/apps/chronos/models.py:1206
-#: aleksis/apps/chronos/tables.py:35
-#: aleksis/apps/chronos/templates/chronos/all.html:17
+#: aleksis/apps/chronos/models.py:352 aleksis/apps/chronos/models.py:422
+#: aleksis/apps/chronos/models.py:998 aleksis/apps/chronos/models.py:1137
+#: aleksis/apps/chronos/models.py:1338
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:3
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:28
+#: aleksis/apps/chronos/templates/chronos/supervision_event_description.txt:1
 msgid "Teachers"
 msgstr "LehrkrÃ¤fte"
 
-#: aleksis/apps/chronos/models.py:399
+#: aleksis/apps/chronos/models.py:358
 msgid "Periods"
 msgstr "Stunden"
 
-#: aleksis/apps/chronos/models.py:401 aleksis/apps/chronos/models.py:1077
-#: aleksis/apps/chronos/models.py:1201 aleksis/apps/chronos/tables.py:34
-#: aleksis/apps/chronos/templates/chronos/all.html:31
+#: aleksis/apps/chronos/models.py:360 aleksis/apps/chronos/models.py:995
+#: aleksis/apps/chronos/models.py:1132 aleksis/apps/chronos/models.py:1326
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:1
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:26
 msgid "Groups"
 msgstr "Gruppen"
 
-#: aleksis/apps/chronos/models.py:424 aleksis/apps/chronos/models.py:519
-#: aleksis/apps/chronos/models.py:795
+#: aleksis/apps/chronos/models.py:394 aleksis/apps/chronos/models.py:490
+#: aleksis/apps/chronos/models.py:716 aleksis/apps/chronos/models.py:1430
+#: aleksis/apps/chronos/models.py:1454
 msgid "Lesson"
 msgstr "Unterrichtsstunde"
 
-#: aleksis/apps/chronos/models.py:425
-#: aleksis/apps/chronos/templates/chronos/lessons_day.html:9
-#: aleksis/apps/chronos/templates/chronos/lessons_day.html:19
+#: aleksis/apps/chronos/models.py:395 aleksis/apps/chronos/models.py:1306
 msgid "Lessons"
 msgstr "Unterrichtsstunden"
 
-#: aleksis/apps/chronos/models.py:433 aleksis/apps/chronos/models.py:1185
+#: aleksis/apps/chronos/models.py:403 aleksis/apps/chronos/models.py:1116
 msgid "Week"
 msgstr "KW"
 
-#: aleksis/apps/chronos/models.py:434 aleksis/apps/chronos/models.py:1186
+#: aleksis/apps/chronos/models.py:404 aleksis/apps/chronos/models.py:1117
 msgid "Year"
 msgstr "Jahr"
 
-#: aleksis/apps/chronos/models.py:437 aleksis/apps/chronos/models.py:654
+#: aleksis/apps/chronos/models.py:407 aleksis/apps/chronos/models.py:620
 msgid "Lesson period"
 msgstr "Unterrichtsstunde"
 
-#: aleksis/apps/chronos/models.py:456
+#: aleksis/apps/chronos/models.py:425 aleksis/apps/chronos/models.py:504
+#: aleksis/apps/chronos/models.py:673 aleksis/apps/chronos/models.py:1144
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
+msgid "Room"
+msgstr "Raum"
+
+#: aleksis/apps/chronos/models.py:428
 msgid "Cancelled?"
 msgstr "EntfÃ¤llt?"
 
-#: aleksis/apps/chronos/models.py:458
+#: aleksis/apps/chronos/models.py:430
 msgid "Cancelled for teachers?"
 msgstr "EntfÃ¤llt fÃ¼r LehrkrÃ¤fte?"
 
-#: aleksis/apps/chronos/models.py:461 aleksis/apps/chronos/models.py:770
-#: aleksis/apps/chronos/models.py:813 aleksis/apps/chronos/models.py:1216
+#: aleksis/apps/chronos/models.py:433 aleksis/apps/chronos/models.py:692
+#: aleksis/apps/chronos/models.py:734 aleksis/apps/chronos/models.py:1147
+#: aleksis/apps/chronos/models.py:1357
 msgid "Comment"
 msgstr "Kommentar"
 
-#: aleksis/apps/chronos/models.py:465
+#: aleksis/apps/chronos/models.py:437
 msgid "Lessons can only be either substituted or cancelled."
 msgstr "Unterrichtsstunden kÃ¶nnen nur entweder vertreten werden oder ausfallen."
 
-#: aleksis/apps/chronos/models.py:506
+#: aleksis/apps/chronos/models.py:477
 msgid "Lesson substitution"
 msgstr "Vertretung"
 
-#: aleksis/apps/chronos/models.py:507
+#: aleksis/apps/chronos/models.py:478
 msgid "Lesson substitutions"
 msgstr "Vertretungen"
 
-#: aleksis/apps/chronos/models.py:655
+#: aleksis/apps/chronos/models.py:621
 msgid "Lesson periods"
 msgstr "Unterrichtsstunden"
 
-#: aleksis/apps/chronos/models.py:693
-msgid "Timetable widget"
-msgstr "Stundenplanwidget"
-
-#: aleksis/apps/chronos/models.py:694
-msgid "Timetable widgets"
-msgstr "Stundenplanwidgets"
-
-#: aleksis/apps/chronos/models.py:708 aleksis/apps/chronos/models.py:726
+#: aleksis/apps/chronos/models.py:635 aleksis/apps/chronos/models.py:648
 msgid "Absence reason"
 msgstr "Absenzgrund"
 
-#: aleksis/apps/chronos/models.py:709
+#: aleksis/apps/chronos/models.py:636
 msgid "Absence reasons"
 msgstr "AbsenzgrÃ¼nde"
 
-#: aleksis/apps/chronos/models.py:735 aleksis/apps/chronos/models.py:974
-#: aleksis/apps/chronos/models.py:1025
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
+#: aleksis/apps/chronos/models.py:657 aleksis/apps/chronos/models.py:889
+#: aleksis/apps/chronos/models.py:943
 msgid "Teacher"
 msgstr "Lehrkraft"
 
-#: aleksis/apps/chronos/models.py:743
+#: aleksis/apps/chronos/models.py:665
 msgid "Group"
 msgstr "Gruppe"
 
-#: aleksis/apps/chronos/models.py:759 aleksis/apps/chronos/models.py:802
+#: aleksis/apps/chronos/models.py:681 aleksis/apps/chronos/models.py:723
 msgid "Start period"
 msgstr "Startstunde"
 
-#: aleksis/apps/chronos/models.py:766 aleksis/apps/chronos/models.py:808
+#: aleksis/apps/chronos/models.py:688 aleksis/apps/chronos/models.py:729
 msgid "End period"
 msgstr "Endstunde"
 
-#: aleksis/apps/chronos/models.py:780
+#: aleksis/apps/chronos/models.py:702
 msgid "Unknown absence"
 msgstr "Unbekannte Absenz"
 
-#: aleksis/apps/chronos/models.py:786
+#: aleksis/apps/chronos/models.py:707
 msgid "Absence"
 msgstr "Absenz"
 
-#: aleksis/apps/chronos/models.py:787
+#: aleksis/apps/chronos/models.py:708
 msgid "Absences"
 msgstr "Fehlstunden"
 
-#: aleksis/apps/chronos/models.py:798
+#: aleksis/apps/chronos/models.py:719
 msgid "Date of exam"
 msgstr "Datum der Klausur"
 
-#: aleksis/apps/chronos/models.py:812 aleksis/apps/chronos/models.py:826
-#: aleksis/apps/chronos/models.py:1059
+#: aleksis/apps/chronos/models.py:733 aleksis/apps/chronos/models.py:746
+#: aleksis/apps/chronos/models.py:977
 msgid "Title"
 msgstr "Titel"
 
-#: aleksis/apps/chronos/models.py:819
+#: aleksis/apps/chronos/models.py:739
 msgid "Exam"
 msgstr "Klausur"
 
-#: aleksis/apps/chronos/models.py:820
+#: aleksis/apps/chronos/models.py:740
 msgid "Exams"
 msgstr "Klausuren"
 
-#: aleksis/apps/chronos/models.py:829
+#: aleksis/apps/chronos/models.py:749
 msgid "Comments"
 msgstr "Kommentare"
 
-#: aleksis/apps/chronos/models.py:868
+#: aleksis/apps/chronos/models.py:788
 msgid "Holiday"
 msgstr "Ferien"
 
-#: aleksis/apps/chronos/models.py:869
+#: aleksis/apps/chronos/models.py:789
 msgid "Holidays"
 msgstr "Ferien"
 
-#: aleksis/apps/chronos/models.py:883 aleksis/apps/chronos/models.py:964
+#: aleksis/apps/chronos/models.py:803 aleksis/apps/chronos/models.py:879
 msgid "Supervision area"
 msgstr "Aufsichtsgebiet"
 
-#: aleksis/apps/chronos/models.py:884
+#: aleksis/apps/chronos/models.py:804
 msgid "Supervision areas"
 msgstr "Aufsichtsgebiete"
 
-#: aleksis/apps/chronos/models.py:901
+#: aleksis/apps/chronos/models.py:816
 msgid "Time period after break starts"
 msgstr "Stunde, nach der die Pause startet"
 
-#: aleksis/apps/chronos/models.py:909
+#: aleksis/apps/chronos/models.py:824
 msgid "Time period before break ends"
 msgstr "Stunde nach der Pause"
 
-#: aleksis/apps/chronos/models.py:949 aleksis/apps/chronos/models.py:968
+#: aleksis/apps/chronos/models.py:864 aleksis/apps/chronos/models.py:883
 msgid "Break"
 msgstr "Pause"
 
-#: aleksis/apps/chronos/models.py:950
+#: aleksis/apps/chronos/models.py:865
 msgid "Breaks"
 msgstr "Pausen"
 
-#: aleksis/apps/chronos/models.py:1005 aleksis/apps/chronos/models.py:1018
-#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:23
-#: aleksis/apps/chronos/templates/chronos/partials/supervision.html:15
+#: aleksis/apps/chronos/models.py:923 aleksis/apps/chronos/models.py:936
+#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:3
 msgid "Supervision"
 msgstr "Aufsicht"
 
-#: aleksis/apps/chronos/models.py:1006
+#: aleksis/apps/chronos/models.py:924 aleksis/apps/chronos/models.py:1622
 msgid "Supervisions"
 msgstr "Aufsichten"
 
-#: aleksis/apps/chronos/models.py:1014
+#: aleksis/apps/chronos/models.py:932
 msgid "Date"
 msgstr "Datum"
 
-#: aleksis/apps/chronos/models.py:1048
+#: aleksis/apps/chronos/models.py:966
 msgid "Supervision substitution"
 msgstr "Aufsichtsvertretung"
 
-#: aleksis/apps/chronos/models.py:1049
+#: aleksis/apps/chronos/models.py:967
 msgid "Supervision substitutions"
 msgstr "Aufsichtsvertretungen"
 
-#: aleksis/apps/chronos/models.py:1067
+#: aleksis/apps/chronos/models.py:985
 msgid "Start time period"
 msgstr "Startstunde"
 
-#: aleksis/apps/chronos/models.py:1073
+#: aleksis/apps/chronos/models.py:991
 msgid "End time period"
 msgstr "Endstunde"
 
-#: aleksis/apps/chronos/models.py:1087
+#: aleksis/apps/chronos/models.py:996 aleksis/apps/chronos/models.py:1332
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:4
+msgid "Rooms"
+msgstr "RÃ¤ume"
+
+#: aleksis/apps/chronos/models.py:1005
 #, python-brace-format
 msgid "Event {pk}"
 msgstr "Veranstaltung {pk}"
 
-#: aleksis/apps/chronos/models.py:1172
-#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:27
+#: aleksis/apps/chronos/models.py:1103
 msgid "Event"
 msgstr "Veranstaltung"
 
-#: aleksis/apps/chronos/models.py:1173
+#: aleksis/apps/chronos/models.py:1104
 msgid "Events"
 msgstr "Veranstaltungen"
 
-#: aleksis/apps/chronos/models.py:1221
+#: aleksis/apps/chronos/models.py:1152
 msgid "Related exam"
 msgstr "ZugehÃ¶rige Klausur"
 
-#: aleksis/apps/chronos/models.py:1251
+#: aleksis/apps/chronos/models.py:1181
 msgid "Extra lesson"
 msgstr "Sonderstunde"
 
-#: aleksis/apps/chronos/models.py:1252
+#: aleksis/apps/chronos/models.py:1182
 msgid "Extra lessons"
 msgstr "Sonderstunden"
 
-#: aleksis/apps/chronos/models.py:1264
+#: aleksis/apps/chronos/models.py:1194
 msgid "Number of days shown in the plan"
 msgstr "Anzahl der Tage, die im Plan angezeigt werden"
 
-#: aleksis/apps/chronos/models.py:1268
+#: aleksis/apps/chronos/models.py:1198
 msgid "Show header box"
 msgstr "Kopfbox anzeigen"
 
-#: aleksis/apps/chronos/models.py:1269 aleksis/apps/chronos/preferences.py:61
+#: aleksis/apps/chronos/models.py:1199 aleksis/apps/chronos/preferences.py:100
 msgid "The header box shows affected teachers/groups."
 msgstr "Die Kopfbox zeigt betroffene LehrkrÃ¤fte/Gruppen."
 
-#: aleksis/apps/chronos/models.py:1276
+#: aleksis/apps/chronos/models.py:1206
 msgid "Revision which triggered the last update"
 msgstr "Revision, die die letzte Aktualisierung ausgelÃ¶st hat"
 
-#: aleksis/apps/chronos/models.py:1337
+#: aleksis/apps/chronos/models.py:1278
 msgid "Automatic plan"
 msgstr "Automatischer Plan"
 
-#: aleksis/apps/chronos/models.py:1338
+#: aleksis/apps/chronos/models.py:1279
 msgid "Automatic plans"
 msgstr "Automatische PlÃ¤ne"
 
-#: aleksis/apps/chronos/models.py:1352
+#: aleksis/apps/chronos/models.py:1293
 msgid "Can view all room timetables"
 msgstr "Kann alle RaumstundenplÃ¤ne sehen"
 
-#: aleksis/apps/chronos/models.py:1353
+#: aleksis/apps/chronos/models.py:1294
 msgid "Can view all group timetables"
 msgstr "Kann alle GruppenstundenplÃ¤ne sehen"
 
-#: aleksis/apps/chronos/models.py:1354
+#: aleksis/apps/chronos/models.py:1295
 msgid "Can view all person timetables"
 msgstr "Kann alle PersonenstundenplÃ¤ne sehen"
 
-#: aleksis/apps/chronos/models.py:1355
+#: aleksis/apps/chronos/models.py:1296
 msgid "Can view timetable overview"
 msgstr "Kann StundenplanÃ¼bersicht sehen"
 
-#: aleksis/apps/chronos/models.py:1356
+#: aleksis/apps/chronos/models.py:1297
 msgid "Can view all lessons per day"
 msgstr "Kann alle Tagesstunden sehen"
 
-#: aleksis/apps/chronos/preferences.py:18
+#: aleksis/apps/chronos/models.py:1298
+#, fuzzy
+#| msgid "Can view all lessons per day"
+msgid "Can view all supervisions per day"
+msgstr "Kann alle Tagesstunden sehen"
+
+#: aleksis/apps/chronos/models.py:1313
+#, fuzzy
+#| msgid "Start time"
+msgid "Start slot number"
+msgstr "Startzeit"
+
+#: aleksis/apps/chronos/models.py:1316
+#, fuzzy
+#| msgid "End time"
+msgid "End slot number"
+msgstr "Endzeit"
+
+#: aleksis/apps/chronos/models.py:1320
+msgid "Course"
+msgstr ""
+
+#: aleksis/apps/chronos/models.py:1353
+#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:4
+msgid "Cancelled"
+msgstr "Entfall"
+
+#: aleksis/apps/chronos/models.py:1401 aleksis/apps/chronos/models.py:1413
+#: aleksis/apps/chronos/models.py:1425
+msgid "{} (instead of {})"
+msgstr ""
+
+#: aleksis/apps/chronos/models.py:1614
+#, fuzzy
+#| msgid "Lesson"
+msgid "Lesson Event"
+msgstr "Unterrichtsstunde"
+
+#: aleksis/apps/chronos/models.py:1615
+#, fuzzy
+#| msgid "Lessons"
+msgid "Lesson Events"
+msgstr "Unterrichtsstunden"
+
+#: aleksis/apps/chronos/models.py:1630
+#, fuzzy
+#| msgid "Supervision"
+msgid "Supervision: {}"
+msgstr "Aufsicht"
+
+#: aleksis/apps/chronos/preferences.py:21
+msgid "Timetables"
+msgstr "StundenplÃ¤ne"
+
+#: aleksis/apps/chronos/preferences.py:29
 msgid "Use parent groups in timetable views"
 msgstr "Elterngruppen in Stundenplanansichten benutzen"
 
-#: aleksis/apps/chronos/preferences.py:20
-msgid "If an lesson or substitution has only one group and this group has parent groups, show the parent groups instead of the original group."
+#: aleksis/apps/chronos/preferences.py:31
+#, fuzzy
+#| msgid "If an lesson or substitution has only one group and this group has parent groups, show the parent groups instead of the original group."
+msgid "If a lesson or substitution has only one group and this group has parent groups, show the parent groups instead of the original group."
 msgstr "Wenn eine Stunde oder Vertretung nur eine Gruppe hat und diese Gruppe Elterngruppen hat, zeige die Elterngruppen anstelle der eigentlichen Gruppe."
 
-#: aleksis/apps/chronos/preferences.py:31
+#: aleksis/apps/chronos/preferences.py:42
 msgid "Shorten groups in timetable views"
 msgstr "Gruppen in Stundenplanansichten kÃ¼rzen"
 
-#: aleksis/apps/chronos/preferences.py:32
+#: aleksis/apps/chronos/preferences.py:43
 msgid "If there are more groups than the set limit, they will be collapsed."
 msgstr "Wenn es mehr Gruppen als das gesetzte Limit gibt, werden die Gruppenangaben gekÃ¼rzt."
 
-#: aleksis/apps/chronos/preferences.py:40
+#: aleksis/apps/chronos/preferences.py:51
 msgid "Limit of groups for shortening of groups"
 msgstr "Anzahl der Gruppen, ab der gekÃ¼rzt wird"
 
-#: aleksis/apps/chronos/preferences.py:42
-msgid "If an user activates shortening of groups,they will be collapsed if there are more groups than this limit."
+#: aleksis/apps/chronos/preferences.py:53
+#, fuzzy
+#| msgid "If an user activates shortening of groups,they will be collapsed if there are more groups than this limit."
+msgid "If a user activates shortening of groups,they will be collapsed if there are more groups than this limit."
 msgstr "Wenn ein Benutzer die KÃ¼rzung von Gruppen aktiviert hat, werden sie ab diesem Limit gekÃ¼rzt."
 
-#: aleksis/apps/chronos/preferences.py:52
+#: aleksis/apps/chronos/preferences.py:65
+#, fuzzy
+#| msgid "Lesson substitutions"
+msgid "Relevant days for substitution plans"
+msgstr "Vertretungen"
+
+#: aleksis/apps/chronos/preferences.py:82
+msgid "Time when substitution plans switch to the next day"
+msgstr ""
+
+#: aleksis/apps/chronos/preferences.py:91
 msgid "Number of days shown on substitutions print view"
 msgstr "Anzahl der Tage, die in der Druckansicht des Vertretungsplanes angezeigt werden soll"
 
-#: aleksis/apps/chronos/preferences.py:60
+#: aleksis/apps/chronos/preferences.py:99
 msgid "Show header box in substitution views"
 msgstr "Kopfbox in VertretungsplÃ¤nen anzeigen"
 
-#: aleksis/apps/chronos/preferences.py:70
+#: aleksis/apps/chronos/preferences.py:109
 msgid "Show parent groups in header box in substitution views instead of original groups"
 msgstr "Elterngruppen in der Kopfbox in VertretungsplÃ¤nen an Stelle der eigentlichen Gruppen anzeigen"
 
-#: aleksis/apps/chronos/preferences.py:79
+#: aleksis/apps/chronos/preferences.py:118
 msgid "How many days in advance users should be notified about timetable changes?"
 msgstr "Wie viele Tage im Voraus sollen Benutzer Ã¼ber StundenplanÃ¤nderungen benachrichtigt werden?"
 
-#: aleksis/apps/chronos/preferences.py:87
+#: aleksis/apps/chronos/preferences.py:126
 msgid "Time for sending notifications about timetable changes"
 msgstr "Zeitpunkt zum Senden von Benachrichtigungen Ã¼ber StundenplanÃ¤nderungen"
 
-#: aleksis/apps/chronos/preferences.py:90
+#: aleksis/apps/chronos/preferences.py:129
 msgid "This is only used for scheduling notifications which doesn't affect the time period configured above. All other notifications affecting the next days are sent immediately."
 msgstr "Dies wird nur benutzt, um Benachrichtigungen zu planen, welche nicht den oben konfigurierten Zeitraum betreffen. Alle weiteren Benachrichtigungen, die die nÃ¤chsten Tage betreffen, werden sofort gesendet."
 
-#: aleksis/apps/chronos/preferences.py:101
-#: aleksis/apps/chronos/preferences.py:109
+#: aleksis/apps/chronos/preferences.py:140
+#: aleksis/apps/chronos/preferences.py:148
 msgid "Send notifications for current timetable changes"
 msgstr "Benachrichtigungen fÃ¼r aktuelle StundenplanÃ¤nderungen verschicken"
 
-#: aleksis/apps/chronos/tables.py:41
-msgid "Substitution"
-msgstr "Vertretung"
-
-#: aleksis/apps/chronos/tables.py:43
-msgid "Manage substitution"
-msgstr "Vertretung verwalten"
-
-#: aleksis/apps/chronos/templates/chronos/all.html:25
-msgid "No teachers timetables available."
-msgstr "Keine StundenplÃ¤ne von LehrkrÃ¤ften vorhanden."
-
-#: aleksis/apps/chronos/templates/chronos/all.html:39
-msgid "No group timetables available."
-msgstr "Keine Gruppen-StundenplÃ¤ne verfÃ¼gbar."
-
-#: aleksis/apps/chronos/templates/chronos/all.html:53
-msgid "No room timetables available."
-msgstr "Keine Raum-StundenplÃ¤ne verfÃ¼gbar."
-
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:11
-msgid "Edit substitution."
-msgstr "Vertretung bearbeiten."
-
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:12
-msgid "Edit substitution"
-msgstr "Vertretung bearbeiten"
+#: aleksis/apps/chronos/preferences.py:158
+#, fuzzy
+#| msgid "Shorten groups in timetable views"
+msgid "Group types to show in timetables"
+msgstr "Gruppen in Stundenplanansichten kÃ¼rzen"
 
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:25
-msgid "Delete"
-msgstr "LÃ¶schen"
+#: aleksis/apps/chronos/preferences.py:159
+msgid "If you leave it empty, all groups will be shown."
+msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:19
-#: aleksis/apps/chronos/templates/chronos/timetable.html:50
-msgid "SMART PLAN"
-msgstr "SMART PLAN"
+#: aleksis/apps/chronos/preferences.py:169
+msgid "Lesson calendar feed color"
+msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:22
-msgid "Show week timetable for"
-msgstr "Wochenplan anzeigen fÃ¼r"
+#: aleksis/apps/chronos/preferences.py:181
+#, fuzzy
+#| msgid "Supervision area"
+msgid "Supervision calendar feed color"
+msgstr "Aufsichtsgebiet"
 
 #: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:10
 msgid "Absent teachers"
@@ -558,186 +552,236 @@ msgstr "Betroffene LehrkrÃ¤fte"
 msgid "Affected groups"
 msgstr "Betroffene Gruppen"
 
-#: aleksis/apps/chronos/templates/chronos/partials/lesson.html:27
-msgid "Cancelled due to an event"
-msgstr "FÃ¤llt wg. einer Veranstaltung aus"
-
-#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:4
-msgid "Cancelled"
-msgstr "Entfall"
+#: aleksis/apps/chronos/templates/chronos/partials/subs/period.html:12
+msgid "all day"
+msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:6
-msgid "Cancelled for teachers"
-msgstr "Entfall fÃ¼r LehrkrÃ¤fte"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:11
+msgid "Print: Substitutions"
+msgstr "Druckansicht: Vertretungen"
 
-#: aleksis/apps/chronos/templates/chronos/partials/today.html:2
-msgid "Today"
-msgstr "Heute"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:12
+msgid "Substitutions"
+msgstr "Vertretungen"
 
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:14
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:25
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:36
-msgid "CW"
-msgstr "KW"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:27
+#, fuzzy
+#| msgid "Times"
+msgid "Time"
+msgstr "Zeiten"
 
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:49
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:31
 msgid "Notes"
 msgstr "Notizen"
 
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:57
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:41
 msgid "No substitutions available."
 msgstr "Keine Vertretungen vorhanden."
 
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:11
-msgid "Print: Substitutions"
-msgstr "Druckansicht: Vertretungen"
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:11
-#: aleksis/apps/chronos/templates/chronos/timetable.html:24
-#: aleksis/apps/chronos/templates/chronos/timetable_print.html:11
-#: aleksis/apps/chronos/util/notifications.py:206
-msgid "Timetable"
-msgstr "Stundenplan"
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:29
-msgid "Group teachers:"
-msgstr "GruppenlehrkrÃ¤fte:"
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:55
-msgid "Show regular timetable"
-msgstr "RegulÃ¤ren Plan anzeigen"
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:63
-#: aleksis/apps/chronos/templates/chronos/timetable.html:84
-msgid "View class register of this week"
-msgstr "Klassenbuch dieser Woche anzeigen"
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:76
-msgid "Show SMART PLAN"
-msgstr "SMART PLAN anzeigen"
-
-#: aleksis/apps/chronos/templates/chronos/widget.html:8
-#, python-format
-msgid ""
-"\n"
-"        My timetable for %(day)s\n"
-"      "
+#: aleksis/apps/chronos/templates/chronos/supervision_event_description.txt:2
+msgid "Areas"
 msgstr ""
-"\n"
-"        Mein Stundenplan fÃ¼r %(day)s\n"
-"      "
 
-#: aleksis/apps/chronos/templates/chronos/widget.html:18
-msgid ""
-"\n"
-"          There is no timetable linked to your person.\n"
-"          "
-msgstr ""
-"\n"
-"          Es gibt keine Stundenplan, der Ihrer Person zugeordnet ist.\n"
-"          "
-
-#: aleksis/apps/chronos/templates/chronos/widget.html:27
-msgid "Go to smart plan"
-msgstr "SMART PLAN anzeigen"
-
-#: aleksis/apps/chronos/util/notifications.py:50
+#: aleksis/apps/chronos/util/notifications.py:48
 #, python-brace-format
 msgid "The {subject} lesson in the {period}. period on {day} has been cancelled."
 msgstr "Die {subject}-Stunde in der {period}. Stunde am {day} fÃ¤llt aus."
 
-#: aleksis/apps/chronos/util/notifications.py:57
+#: aleksis/apps/chronos/util/notifications.py:55
 #, python-brace-format
 msgid "The {subject} lesson in the {period}. period on {day} has some current changes."
 msgstr "Die {subject}-Stunde in der {period}. Stunde am {day} hat aktuelle Ã„nderungen."
 
-#: aleksis/apps/chronos/util/notifications.py:66
+#: aleksis/apps/chronos/util/notifications.py:64
 #, python-brace-format
 msgid "The teacher {old} is substituted by {new}."
 msgid_plural "The teachers {old} are substituted by {new}."
 msgstr[0] "Die Lehrkraft {old} wird von {new} vertreten."
 msgstr[1] "Die LehrkrÃ¤fte {old} werden von {new} vertreten."
 
-#: aleksis/apps/chronos/util/notifications.py:78
+#: aleksis/apps/chronos/util/notifications.py:76
 #, python-brace-format
 msgid "The subject is changed to {subject}."
 msgstr "Das Fach ist zu {subject} geÃ¤ndert."
 
-#: aleksis/apps/chronos/util/notifications.py:84
+#: aleksis/apps/chronos/util/notifications.py:82
 #, python-brace-format
 msgid "The lesson is moved from {old} to {new}."
 msgstr "Die Stunde wurde von {old} nach {new} verschoben."
 
-#: aleksis/apps/chronos/util/notifications.py:93
+#: aleksis/apps/chronos/util/notifications.py:91
 #, python-brace-format
 msgid "There is an additional comment: {comment}."
 msgstr "Es gibt einen zusÃ¤tzlichen Hinweis: {comment}."
 
-#: aleksis/apps/chronos/util/notifications.py:101
+#: aleksis/apps/chronos/util/notifications.py:99
 #, python-brace-format
 msgid "There is an event that starts on {date_start}, {period_from}. period and ends on {date_end}, {period_to}. period:"
 msgstr "Es gibt eine Veranstaltung, die am {date_start} in der {period_from}. Stunde startet und am {date_end} in der {period_to}. Stunde endet:"
 
-#: aleksis/apps/chronos/util/notifications.py:114
+#: aleksis/apps/chronos/util/notifications.py:112
 #, python-brace-format
 msgid "There is an event on {date} from the {period_from}. period to the {period_to}. period:"
 msgstr "Es gibt eine Veranstaltung am {date} von der {period_from}. Stunde bis zur {period_to}. Stunde:"
 
-#: aleksis/apps/chronos/util/notifications.py:125
-#: aleksis/apps/chronos/util/notifications.py:145
+#: aleksis/apps/chronos/util/notifications.py:123
+#: aleksis/apps/chronos/util/notifications.py:143
 #, python-brace-format
 msgid "Groups: {groups}"
 msgstr "Gruppen: {groups}"
 
-#: aleksis/apps/chronos/util/notifications.py:127
-#: aleksis/apps/chronos/util/notifications.py:149
+#: aleksis/apps/chronos/util/notifications.py:125
+#: aleksis/apps/chronos/util/notifications.py:147
 #, python-brace-format
 msgid "Teachers: {teachers}"
 msgstr "LehrkrÃ¤fte: {teachers}"
 
-#: aleksis/apps/chronos/util/notifications.py:130
+#: aleksis/apps/chronos/util/notifications.py:128
 #, python-brace-format
 msgid "Rooms: {rooms}"
 msgstr "RÃ¤ume: {rooms}"
 
-#: aleksis/apps/chronos/util/notifications.py:137
+#: aleksis/apps/chronos/util/notifications.py:135
 #, python-brace-format
 msgid "There is an extra lesson on {date} in the {period}. period:"
 msgstr "Es gibt eine Zusatzstunde am {date} in der {period}. Stunde:"
 
-#: aleksis/apps/chronos/util/notifications.py:147
+#: aleksis/apps/chronos/util/notifications.py:145
 #, python-brace-format
 msgid "Subject: {subject}"
 msgstr "Fach: {subject}"
 
-#: aleksis/apps/chronos/util/notifications.py:151
+#: aleksis/apps/chronos/util/notifications.py:149
 #, python-brace-format
 msgid "Room: {room}"
 msgstr "Raum: {room}"
 
-#: aleksis/apps/chronos/util/notifications.py:153
+#: aleksis/apps/chronos/util/notifications.py:151
 #, python-brace-format
 msgid "Comment: {comment}."
 msgstr "Kommentar: {comment}."
 
-#: aleksis/apps/chronos/util/notifications.py:156
+#: aleksis/apps/chronos/util/notifications.py:154
 #, python-brace-format
 msgid "The supervision of {old} on {date} between the {period_from}. period and the {period_to}. period in the area {area} is substituted by {new}."
 msgstr "Die Aufsicht von {old} am {date} zwischen der {period_from}. Stunde un der {period_to}. Stunde im Gebiet {area} wird von {new} vertreten."
 
-#: aleksis/apps/chronos/util/notifications.py:207
+#: aleksis/apps/chronos/util/notifications.py:204
+msgid "Timetable"
+msgstr "Stundenplan"
+
+#: aleksis/apps/chronos/util/notifications.py:205
 msgid "There are current changes to your timetable."
 msgstr "Es gibt aktuelle Ã„nderungen in Ihrem Stundenplan."
 
-#: aleksis/apps/chronos/views.py:270
-msgid "The substitution has been saved."
-msgstr "Die Vertretung wurde gespeichert."
+#~ msgid "Options for timetables"
+#~ msgstr "Einstellungen fÃ¼r StundenplÃ¤ne"
+
+#~ msgid "Optional data for timetables"
+#~ msgstr "Optionale Daten fÃ¼r StundenplÃ¤ne"
+
+#~ msgid "My timetable"
+#~ msgstr "Mein Plan"
+
+#~ msgid "All timetables"
+#~ msgstr "Alle StundenplÃ¤ne"
+
+#~ msgid "Daily lessons"
+#~ msgstr "Tagesstunden"
+
+#~ msgid "Show announcement in timetable views?"
+#~ msgstr "AnkÃ¼ndigungen in Stundenplanansichten anzeigen?"
+
+#~ msgid "Can view room timetable"
+#~ msgstr "Kann Raum-Stundenplan sehen"
+
+#~ msgid "Timetable widget"
+#~ msgstr "Stundenplanwidget"
+
+#~ msgid "Timetable widgets"
+#~ msgstr "Stundenplanwidgets"
+
+#~ msgid "Substitution"
+#~ msgstr "Vertretung"
+
+#~ msgid "Manage substitution"
+#~ msgstr "Vertretung verwalten"
 
-#: aleksis/apps/chronos/views.py:291
-msgid "The substitution has been deleted."
-msgstr "Die Vertretung wurde gelÃ¶scht."
+#~ msgid "No teachers timetables available."
+#~ msgstr "Keine StundenplÃ¤ne von LehrkrÃ¤ften vorhanden."
+
+#~ msgid "No group timetables available."
+#~ msgstr "Keine Gruppen-StundenplÃ¤ne verfÃ¼gbar."
+
+#~ msgid "No room timetables available."
+#~ msgstr "Keine Raum-StundenplÃ¤ne verfÃ¼gbar."
+
+#~ msgid "Edit substitution."
+#~ msgstr "Vertretung bearbeiten."
+
+#~ msgid "Edit substitution"
+#~ msgstr "Vertretung bearbeiten"
+
+#~ msgid "Delete"
+#~ msgstr "LÃ¶schen"
+
+#~ msgid "SMART PLAN"
+#~ msgstr "SMART PLAN"
+
+#~ msgid "Show week timetable for"
+#~ msgstr "Wochenplan anzeigen fÃ¼r"
+
+#~ msgid "Cancelled due to an event"
+#~ msgstr "FÃ¤llt wg. einer Veranstaltung aus"
+
+#~ msgid "Cancelled for teachers"
+#~ msgstr "Entfall fÃ¼r LehrkrÃ¤fte"
+
+#~ msgid "Today"
+#~ msgstr "Heute"
+
+#~ msgid "CW"
+#~ msgstr "KW"
+
+#~ msgid "Group teachers:"
+#~ msgstr "GruppenlehrkrÃ¤fte:"
+
+#~ msgid "Show regular timetable"
+#~ msgstr "RegulÃ¤ren Plan anzeigen"
+
+#~ msgid "View class register of this week"
+#~ msgstr "Klassenbuch dieser Woche anzeigen"
+
+#~ msgid "Show SMART PLAN"
+#~ msgstr "SMART PLAN anzeigen"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "        My timetable for %(day)s\n"
+#~ "      "
+#~ msgstr ""
+#~ "\n"
+#~ "        Mein Stundenplan fÃ¼r %(day)s\n"
+#~ "      "
+
+#~ msgid ""
+#~ "\n"
+#~ "          There is no timetable linked to your person.\n"
+#~ "          "
+#~ msgstr ""
+#~ "\n"
+#~ "          Es gibt keine Stundenplan, der Ihrer Person zugeordnet ist.\n"
+#~ "          "
+
+#~ msgid "Go to smart plan"
+#~ msgstr "SMART PLAN anzeigen"
+
+#~ msgid "The substitution has been saved."
+#~ msgstr "Die Vertretung wurde gespeichert."
+
+#~ msgid "The substitution has been deleted."
+#~ msgstr "Die Vertretung wurde gelÃ¶scht."
 
 #~ msgid "View class register of the current week"
 #~ msgstr "Klassenbuch der aktuellen Woche anzeigen"
@@ -841,9 +885,6 @@ msgstr "Die Vertretung wurde gelÃ¶scht."
 #~ msgid "Select"
 #~ msgstr "AuswÃ¤hlen"
 
-#~ msgid "Times"
-#~ msgstr "Zeiten"
-
 #~ msgid "Calendar Week"
 #~ msgstr "Kalenderwoche"
 
diff --git a/aleksis/apps/chronos/locale/fr/LC_MESSAGES/django.po b/aleksis/apps/chronos/locale/fr/LC_MESSAGES/django.po
index 2de6a0f73e58b9d49c4178a9947ad53e61475c72..0efbbcbc0bddc2a0dfd0fc65f2f487e69d5c6532 100644
--- a/aleksis/apps/chronos/locale/fr/LC_MESSAGES/django.po
+++ b/aleksis/apps/chronos/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-06-21 11:32+0200\n"
+"POT-Creation-Date: 2024-08-18 14:23+0200\n"
 "PO-Revision-Date: 2021-06-16 11:59+0000\n"
 "Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
 "Language-Team: French <https://translate.edugit.org/projects/aleksis/aleksis-app-chronos/fr/>\n"
@@ -18,76 +18,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.4\n"
 
-#: aleksis/apps/chronos/form_extensions.py:7
-msgid "Options for timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/form_extensions.py:8
-msgid "Optional data for timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:6 aleksis/apps/chronos/preferences.py:10
-msgid "Timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:16
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:11
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:18
-msgid "My timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:27
-#: aleksis/apps/chronos/templates/chronos/all.html:11
-#: aleksis/apps/chronos/templates/chronos/all.html:12
-msgid "All timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:38
-msgid "Daily lessons"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:49
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:11
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:17
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:12
-msgid "Substitutions"
-msgstr ""
-
 #: aleksis/apps/chronos/mixins.py:25
 msgid "Linked validity range"
 msgstr ""
 
-#: aleksis/apps/chronos/model_extensions.py:142
-msgid "Show announcement in timetable views?"
-msgstr ""
-
-#: aleksis/apps/chronos/model_extensions.py:151
+#: aleksis/apps/chronos/model_extensions.py:145
 msgid "Can view group timetable"
 msgstr ""
 
-#: aleksis/apps/chronos/model_extensions.py:155
+#: aleksis/apps/chronos/model_extensions.py:149
 msgid "Can view person timetable"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:86
+#: aleksis/apps/chronos/models.py:87
 msgid "School term"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:89 aleksis/apps/chronos/models.py:699
+#: aleksis/apps/chronos/models.py:90 aleksis/apps/chronos/models.py:626
+#: aleksis/apps/chronos/models.py:1310
 msgid "Name"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:91 aleksis/apps/chronos/models.py:754
-#: aleksis/apps/chronos/models.py:827 aleksis/apps/chronos/models.py:1061
+#: aleksis/apps/chronos/models.py:92 aleksis/apps/chronos/models.py:676
+#: aleksis/apps/chronos/models.py:747 aleksis/apps/chronos/models.py:979
 msgid "Start date"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:92 aleksis/apps/chronos/models.py:755
-#: aleksis/apps/chronos/models.py:828 aleksis/apps/chronos/models.py:1062
+#: aleksis/apps/chronos/models.py:93 aleksis/apps/chronos/models.py:677
+#: aleksis/apps/chronos/models.py:748 aleksis/apps/chronos/models.py:980
 msgid "End date"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:111
+#: aleksis/apps/chronos/models.py:112
 msgid "The start date must be earlier than the end date."
 msgstr ""
 
@@ -107,441 +69,455 @@ msgstr ""
 msgid "Validity ranges"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:150
+#: aleksis/apps/chronos/models.py:149
 msgid "Week day"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:152
+#: aleksis/apps/chronos/models.py:151
 msgid "Number of period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:154
+#: aleksis/apps/chronos/models.py:153
 msgid "Start time"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:155
+#: aleksis/apps/chronos/models.py:154
 msgid "End time"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:338 aleksis/apps/chronos/models.py:525
-#: aleksis/apps/chronos/models.py:1191
+#: aleksis/apps/chronos/models.py:324 aleksis/apps/chronos/models.py:496
+#: aleksis/apps/chronos/models.py:1122
 msgid "Time period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:339
+#: aleksis/apps/chronos/models.py:325
 msgid "Time periods"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:343 aleksis/apps/chronos/models.py:364
-#: aleksis/apps/chronos/models.py:698 aleksis/apps/chronos/models.py:873
-#: aleksis/apps/chronos/models.py:895
+#: aleksis/apps/chronos/models.py:329 aleksis/apps/chronos/models.py:625
+#: aleksis/apps/chronos/models.py:793 aleksis/apps/chronos/models.py:810
 msgid "Short name"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:344 aleksis/apps/chronos/models.py:365
-#: aleksis/apps/chronos/models.py:874 aleksis/apps/chronos/models.py:896
+#: aleksis/apps/chronos/models.py:330 aleksis/apps/chronos/models.py:794
+#: aleksis/apps/chronos/models.py:811
 msgid "Long name"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:346
+#: aleksis/apps/chronos/models.py:332
 msgid "Foreground colour"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:347
+#: aleksis/apps/chronos/models.py:333
 msgid "Background colour"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:354 aleksis/apps/chronos/models.py:390
-#: aleksis/apps/chronos/models.py:446 aleksis/apps/chronos/models.py:1198
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
+#: aleksis/apps/chronos/models.py:340 aleksis/apps/chronos/models.py:349
+#: aleksis/apps/chronos/models.py:416 aleksis/apps/chronos/models.py:1129
+#: aleksis/apps/chronos/models.py:1345
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:2
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:29
 msgid "Subject"
 msgstr "Sujet"
 
-#: aleksis/apps/chronos/models.py:355
+#: aleksis/apps/chronos/models.py:341
 #, fuzzy
 #| msgid "Subject"
 msgid "Subjects"
 msgstr "Sujet"
 
-#: aleksis/apps/chronos/models.py:374
-msgid "Can view room timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:376 aleksis/apps/chronos/models.py:454
-#: aleksis/apps/chronos/models.py:533 aleksis/apps/chronos/models.py:751
-#: aleksis/apps/chronos/models.py:1213
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
-msgid "Room"
-msgstr "Salle"
-
-#: aleksis/apps/chronos/models.py:377 aleksis/apps/chronos/models.py:1078
-#: aleksis/apps/chronos/templates/chronos/all.html:45
-msgid "Rooms"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:393 aleksis/apps/chronos/models.py:452
-#: aleksis/apps/chronos/models.py:1080 aleksis/apps/chronos/models.py:1206
-#: aleksis/apps/chronos/tables.py:35
-#: aleksis/apps/chronos/templates/chronos/all.html:17
+#: aleksis/apps/chronos/models.py:352 aleksis/apps/chronos/models.py:422
+#: aleksis/apps/chronos/models.py:998 aleksis/apps/chronos/models.py:1137
+#: aleksis/apps/chronos/models.py:1338
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:3
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:28
+#: aleksis/apps/chronos/templates/chronos/supervision_event_description.txt:1
 msgid "Teachers"
 msgstr "Profs"
 
-#: aleksis/apps/chronos/models.py:399
+#: aleksis/apps/chronos/models.py:358
 msgid "Periods"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:401 aleksis/apps/chronos/models.py:1077
-#: aleksis/apps/chronos/models.py:1201 aleksis/apps/chronos/tables.py:34
-#: aleksis/apps/chronos/templates/chronos/all.html:31
+#: aleksis/apps/chronos/models.py:360 aleksis/apps/chronos/models.py:995
+#: aleksis/apps/chronos/models.py:1132 aleksis/apps/chronos/models.py:1326
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:1
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:26
 msgid "Groups"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:424 aleksis/apps/chronos/models.py:519
-#: aleksis/apps/chronos/models.py:795
+#: aleksis/apps/chronos/models.py:394 aleksis/apps/chronos/models.py:490
+#: aleksis/apps/chronos/models.py:716 aleksis/apps/chronos/models.py:1430
+#: aleksis/apps/chronos/models.py:1454
 msgid "Lesson"
 msgstr "Cours"
 
-#: aleksis/apps/chronos/models.py:425
-#: aleksis/apps/chronos/templates/chronos/lessons_day.html:9
-#: aleksis/apps/chronos/templates/chronos/lessons_day.html:19
+#: aleksis/apps/chronos/models.py:395 aleksis/apps/chronos/models.py:1306
 msgid "Lessons"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:433 aleksis/apps/chronos/models.py:1185
+#: aleksis/apps/chronos/models.py:403 aleksis/apps/chronos/models.py:1116
 msgid "Week"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:434 aleksis/apps/chronos/models.py:1186
+#: aleksis/apps/chronos/models.py:404 aleksis/apps/chronos/models.py:1117
 msgid "Year"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:437 aleksis/apps/chronos/models.py:654
+#: aleksis/apps/chronos/models.py:407 aleksis/apps/chronos/models.py:620
 msgid "Lesson period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:456
+#: aleksis/apps/chronos/models.py:425 aleksis/apps/chronos/models.py:504
+#: aleksis/apps/chronos/models.py:673 aleksis/apps/chronos/models.py:1144
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
+msgid "Room"
+msgstr "Salle"
+
+#: aleksis/apps/chronos/models.py:428
 msgid "Cancelled?"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:458
+#: aleksis/apps/chronos/models.py:430
 msgid "Cancelled for teachers?"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:461 aleksis/apps/chronos/models.py:770
-#: aleksis/apps/chronos/models.py:813 aleksis/apps/chronos/models.py:1216
+#: aleksis/apps/chronos/models.py:433 aleksis/apps/chronos/models.py:692
+#: aleksis/apps/chronos/models.py:734 aleksis/apps/chronos/models.py:1147
+#: aleksis/apps/chronos/models.py:1357
 msgid "Comment"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:465
+#: aleksis/apps/chronos/models.py:437
 msgid "Lessons can only be either substituted or cancelled."
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:506
+#: aleksis/apps/chronos/models.py:477
 msgid "Lesson substitution"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:507
+#: aleksis/apps/chronos/models.py:478
 msgid "Lesson substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:655
+#: aleksis/apps/chronos/models.py:621
 msgid "Lesson periods"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:693
-msgid "Timetable widget"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:694
-msgid "Timetable widgets"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:708 aleksis/apps/chronos/models.py:726
+#: aleksis/apps/chronos/models.py:635 aleksis/apps/chronos/models.py:648
 msgid "Absence reason"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:709
+#: aleksis/apps/chronos/models.py:636
 msgid "Absence reasons"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:735 aleksis/apps/chronos/models.py:974
-#: aleksis/apps/chronos/models.py:1025
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
+#: aleksis/apps/chronos/models.py:657 aleksis/apps/chronos/models.py:889
+#: aleksis/apps/chronos/models.py:943
 msgid "Teacher"
 msgstr "prof"
 
-#: aleksis/apps/chronos/models.py:743
+#: aleksis/apps/chronos/models.py:665
 msgid "Group"
 msgstr "groupe"
 
-#: aleksis/apps/chronos/models.py:759 aleksis/apps/chronos/models.py:802
+#: aleksis/apps/chronos/models.py:681 aleksis/apps/chronos/models.py:723
 msgid "Start period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:766 aleksis/apps/chronos/models.py:808
+#: aleksis/apps/chronos/models.py:688 aleksis/apps/chronos/models.py:729
 msgid "End period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:780
+#: aleksis/apps/chronos/models.py:702
 msgid "Unknown absence"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:786
+#: aleksis/apps/chronos/models.py:707
 msgid "Absence"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:787
+#: aleksis/apps/chronos/models.py:708
 msgid "Absences"
 msgstr "Absences"
 
-#: aleksis/apps/chronos/models.py:798
+#: aleksis/apps/chronos/models.py:719
 msgid "Date of exam"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:812 aleksis/apps/chronos/models.py:826
-#: aleksis/apps/chronos/models.py:1059
+#: aleksis/apps/chronos/models.py:733 aleksis/apps/chronos/models.py:746
+#: aleksis/apps/chronos/models.py:977
 msgid "Title"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:819
+#: aleksis/apps/chronos/models.py:739
 msgid "Exam"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:820
+#: aleksis/apps/chronos/models.py:740
 msgid "Exams"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:829
+#: aleksis/apps/chronos/models.py:749
 msgid "Comments"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:868
+#: aleksis/apps/chronos/models.py:788
 msgid "Holiday"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:869
+#: aleksis/apps/chronos/models.py:789
 msgid "Holidays"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:883 aleksis/apps/chronos/models.py:964
+#: aleksis/apps/chronos/models.py:803 aleksis/apps/chronos/models.py:879
 msgid "Supervision area"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:884
+#: aleksis/apps/chronos/models.py:804
 msgid "Supervision areas"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:901
+#: aleksis/apps/chronos/models.py:816
 msgid "Time period after break starts"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:909
+#: aleksis/apps/chronos/models.py:824
 msgid "Time period before break ends"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:949 aleksis/apps/chronos/models.py:968
+#: aleksis/apps/chronos/models.py:864 aleksis/apps/chronos/models.py:883
 msgid "Break"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:950
+#: aleksis/apps/chronos/models.py:865
 msgid "Breaks"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1005 aleksis/apps/chronos/models.py:1018
-#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:23
-#: aleksis/apps/chronos/templates/chronos/partials/supervision.html:15
+#: aleksis/apps/chronos/models.py:923 aleksis/apps/chronos/models.py:936
+#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:3
 msgid "Supervision"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1006
+#: aleksis/apps/chronos/models.py:924 aleksis/apps/chronos/models.py:1622
 msgid "Supervisions"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1014
+#: aleksis/apps/chronos/models.py:932
 msgid "Date"
 msgstr "Date"
 
-#: aleksis/apps/chronos/models.py:1048
+#: aleksis/apps/chronos/models.py:966
 msgid "Supervision substitution"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1049
+#: aleksis/apps/chronos/models.py:967
 msgid "Supervision substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1067
+#: aleksis/apps/chronos/models.py:985
 msgid "Start time period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1073
+#: aleksis/apps/chronos/models.py:991
 msgid "End time period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1087
+#: aleksis/apps/chronos/models.py:996 aleksis/apps/chronos/models.py:1332
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:4
+msgid "Rooms"
+msgstr ""
+
+#: aleksis/apps/chronos/models.py:1005
 #, python-brace-format
 msgid "Event {pk}"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1172
-#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:27
+#: aleksis/apps/chronos/models.py:1103
 msgid "Event"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1173
+#: aleksis/apps/chronos/models.py:1104
 msgid "Events"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1221
+#: aleksis/apps/chronos/models.py:1152
 msgid "Related exam"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1251
+#: aleksis/apps/chronos/models.py:1181
 msgid "Extra lesson"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1252
+#: aleksis/apps/chronos/models.py:1182
 msgid "Extra lessons"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1264
+#: aleksis/apps/chronos/models.py:1194
 msgid "Number of days shown in the plan"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1268
+#: aleksis/apps/chronos/models.py:1198
 msgid "Show header box"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1269 aleksis/apps/chronos/preferences.py:61
+#: aleksis/apps/chronos/models.py:1199 aleksis/apps/chronos/preferences.py:100
 msgid "The header box shows affected teachers/groups."
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1276
+#: aleksis/apps/chronos/models.py:1206
 msgid "Revision which triggered the last update"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1337
+#: aleksis/apps/chronos/models.py:1278
 msgid "Automatic plan"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1338
+#: aleksis/apps/chronos/models.py:1279
 msgid "Automatic plans"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1352
+#: aleksis/apps/chronos/models.py:1293
 msgid "Can view all room timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1353
+#: aleksis/apps/chronos/models.py:1294
 msgid "Can view all group timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1354
+#: aleksis/apps/chronos/models.py:1295
 msgid "Can view all person timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1355
+#: aleksis/apps/chronos/models.py:1296
 msgid "Can view timetable overview"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1356
+#: aleksis/apps/chronos/models.py:1297
 msgid "Can view all lessons per day"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:18
-msgid "Use parent groups in timetable views"
+#: aleksis/apps/chronos/models.py:1298
+msgid "Can view all supervisions per day"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:20
-msgid "If an lesson or substitution has only one group and this group has parent groups, show the parent groups instead of the original group."
+#: aleksis/apps/chronos/models.py:1313
+msgid "Start slot number"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:31
-msgid "Shorten groups in timetable views"
+#: aleksis/apps/chronos/models.py:1316
+msgid "End slot number"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:32
-msgid "If there are more groups than the set limit, they will be collapsed."
+#: aleksis/apps/chronos/models.py:1320
+msgid "Course"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:40
-msgid "Limit of groups for shortening of groups"
+#: aleksis/apps/chronos/models.py:1353
+#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:4
+msgid "Cancelled"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:42
-msgid "If an user activates shortening of groups,they will be collapsed if there are more groups than this limit."
+#: aleksis/apps/chronos/models.py:1401 aleksis/apps/chronos/models.py:1413
+#: aleksis/apps/chronos/models.py:1425
+msgid "{} (instead of {})"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:52
-msgid "Number of days shown on substitutions print view"
+#: aleksis/apps/chronos/models.py:1614
+#, fuzzy
+#| msgid "Lesson"
+msgid "Lesson Event"
+msgstr "Cours"
+
+#: aleksis/apps/chronos/models.py:1615
+#, fuzzy
+#| msgid "Lesson"
+msgid "Lesson Events"
+msgstr "Cours"
+
+#: aleksis/apps/chronos/models.py:1630
+msgid "Supervision: {}"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:60
-msgid "Show header box in substitution views"
+#: aleksis/apps/chronos/preferences.py:21
+msgid "Timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:70
-msgid "Show parent groups in header box in substitution views instead of original groups"
+#: aleksis/apps/chronos/preferences.py:29
+msgid "Use parent groups in timetable views"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:79
-msgid "How many days in advance users should be notified about timetable changes?"
+#: aleksis/apps/chronos/preferences.py:31
+msgid "If a lesson or substitution has only one group and this group has parent groups, show the parent groups instead of the original group."
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:87
-msgid "Time for sending notifications about timetable changes"
+#: aleksis/apps/chronos/preferences.py:42
+msgid "Shorten groups in timetable views"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:90
-msgid "This is only used for scheduling notifications which doesn't affect the time period configured above. All other notifications affecting the next days are sent immediately."
+#: aleksis/apps/chronos/preferences.py:43
+msgid "If there are more groups than the set limit, they will be collapsed."
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:101
-#: aleksis/apps/chronos/preferences.py:109
-msgid "Send notifications for current timetable changes"
+#: aleksis/apps/chronos/preferences.py:51
+msgid "Limit of groups for shortening of groups"
+msgstr ""
+
+#: aleksis/apps/chronos/preferences.py:53
+msgid "If a user activates shortening of groups,they will be collapsed if there are more groups than this limit."
 msgstr ""
 
-#: aleksis/apps/chronos/tables.py:41
-msgid "Substitution"
+#: aleksis/apps/chronos/preferences.py:65
+msgid "Relevant days for substitution plans"
+msgstr ""
+
+#: aleksis/apps/chronos/preferences.py:82
+msgid "Time when substitution plans switch to the next day"
+msgstr ""
+
+#: aleksis/apps/chronos/preferences.py:91
+msgid "Number of days shown on substitutions print view"
+msgstr ""
+
+#: aleksis/apps/chronos/preferences.py:99
+msgid "Show header box in substitution views"
 msgstr ""
 
-#: aleksis/apps/chronos/tables.py:43
-msgid "Manage substitution"
+#: aleksis/apps/chronos/preferences.py:109
+msgid "Show parent groups in header box in substitution views instead of original groups"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/all.html:25
-msgid "No teachers timetables available."
+#: aleksis/apps/chronos/preferences.py:118
+msgid "How many days in advance users should be notified about timetable changes?"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/all.html:39
-msgid "No group timetables available."
+#: aleksis/apps/chronos/preferences.py:126
+msgid "Time for sending notifications about timetable changes"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/all.html:53
-msgid "No room timetables available."
+#: aleksis/apps/chronos/preferences.py:129
+msgid "This is only used for scheduling notifications which doesn't affect the time period configured above. All other notifications affecting the next days are sent immediately."
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:11
-msgid "Edit substitution."
+#: aleksis/apps/chronos/preferences.py:140
+#: aleksis/apps/chronos/preferences.py:148
+msgid "Send notifications for current timetable changes"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:12
-msgid "Edit substitution"
+#: aleksis/apps/chronos/preferences.py:158
+msgid "Group types to show in timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:25
-msgid "Delete"
+#: aleksis/apps/chronos/preferences.py:159
+msgid "If you leave it empty, all groups will be shown."
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:19
-#: aleksis/apps/chronos/templates/chronos/timetable.html:50
-msgid "SMART PLAN"
+#: aleksis/apps/chronos/preferences.py:169
+msgid "Lesson calendar feed color"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:22
-msgid "Show week timetable for"
+#: aleksis/apps/chronos/preferences.py:181
+msgid "Supervision calendar feed color"
 msgstr ""
 
 #: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:10
@@ -560,178 +536,123 @@ msgstr ""
 msgid "Affected groups"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/lesson.html:27
-msgid "Cancelled due to an event"
+#: aleksis/apps/chronos/templates/chronos/partials/subs/period.html:12
+msgid "all day"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:4
-msgid "Cancelled"
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:6
-msgid "Cancelled for teachers"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:11
+msgid "Print: Substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/today.html:2
-msgid "Today"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:12
+msgid "Substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:14
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:25
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:36
-msgid "CW"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:27
+msgid "Time"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:49
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:31
 msgid "Notes"
 msgstr "Notes"
 
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:57
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:41
 msgid "No substitutions available."
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:11
-msgid "Print: Substitutions"
+#: aleksis/apps/chronos/templates/chronos/supervision_event_description.txt:2
+msgid "Areas"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/timetable.html:11
-#: aleksis/apps/chronos/templates/chronos/timetable.html:24
-#: aleksis/apps/chronos/templates/chronos/timetable_print.html:11
-#: aleksis/apps/chronos/util/notifications.py:206
-msgid "Timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:29
-msgid "Group teachers:"
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:55
-msgid "Show regular timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:63
-#: aleksis/apps/chronos/templates/chronos/timetable.html:84
-msgid "View class register of this week"
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:76
-msgid "Show SMART PLAN"
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/widget.html:8
-#, python-format
-msgid ""
-"\n"
-"        My timetable for %(day)s\n"
-"      "
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/widget.html:18
-msgid ""
-"\n"
-"          There is no timetable linked to your person.\n"
-"          "
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/widget.html:27
-msgid "Go to smart plan"
-msgstr ""
-
-#: aleksis/apps/chronos/util/notifications.py:50
+#: aleksis/apps/chronos/util/notifications.py:48
 #, python-brace-format
 msgid "The {subject} lesson in the {period}. period on {day} has been cancelled."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:57
+#: aleksis/apps/chronos/util/notifications.py:55
 #, python-brace-format
 msgid "The {subject} lesson in the {period}. period on {day} has some current changes."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:66
+#: aleksis/apps/chronos/util/notifications.py:64
 #, python-brace-format
 msgid "The teacher {old} is substituted by {new}."
 msgid_plural "The teachers {old} are substituted by {new}."
 msgstr[0] ""
 msgstr[1] ""
 
-#: aleksis/apps/chronos/util/notifications.py:78
+#: aleksis/apps/chronos/util/notifications.py:76
 #, python-brace-format
 msgid "The subject is changed to {subject}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:84
+#: aleksis/apps/chronos/util/notifications.py:82
 #, python-brace-format
 msgid "The lesson is moved from {old} to {new}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:93
+#: aleksis/apps/chronos/util/notifications.py:91
 #, python-brace-format
 msgid "There is an additional comment: {comment}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:101
+#: aleksis/apps/chronos/util/notifications.py:99
 #, python-brace-format
 msgid "There is an event that starts on {date_start}, {period_from}. period and ends on {date_end}, {period_to}. period:"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:114
+#: aleksis/apps/chronos/util/notifications.py:112
 #, python-brace-format
 msgid "There is an event on {date} from the {period_from}. period to the {period_to}. period:"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:125
-#: aleksis/apps/chronos/util/notifications.py:145
+#: aleksis/apps/chronos/util/notifications.py:123
+#: aleksis/apps/chronos/util/notifications.py:143
 #, python-brace-format
 msgid "Groups: {groups}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:127
-#: aleksis/apps/chronos/util/notifications.py:149
+#: aleksis/apps/chronos/util/notifications.py:125
+#: aleksis/apps/chronos/util/notifications.py:147
 #, python-brace-format
 msgid "Teachers: {teachers}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:130
+#: aleksis/apps/chronos/util/notifications.py:128
 #, python-brace-format
 msgid "Rooms: {rooms}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:137
+#: aleksis/apps/chronos/util/notifications.py:135
 #, python-brace-format
 msgid "There is an extra lesson on {date} in the {period}. period:"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:147
+#: aleksis/apps/chronos/util/notifications.py:145
 #, fuzzy, python-brace-format
 #| msgid "Subject"
 msgid "Subject: {subject}"
 msgstr "Sujet"
 
-#: aleksis/apps/chronos/util/notifications.py:151
+#: aleksis/apps/chronos/util/notifications.py:149
 #, python-brace-format
 msgid "Room: {room}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:153
+#: aleksis/apps/chronos/util/notifications.py:151
 #, python-brace-format
 msgid "Comment: {comment}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:156
+#: aleksis/apps/chronos/util/notifications.py:154
 #, python-brace-format
 msgid "The supervision of {old} on {date} between the {period_from}. period and the {period_to}. period in the area {area} is substituted by {new}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:207
-msgid "There are current changes to your timetable."
-msgstr ""
-
-#: aleksis/apps/chronos/views.py:270
-msgid "The substitution has been saved."
+#: aleksis/apps/chronos/util/notifications.py:204
+msgid "Timetable"
 msgstr ""
 
-#: aleksis/apps/chronos/views.py:291
-msgid "The substitution has been deleted."
+#: aleksis/apps/chronos/util/notifications.py:205
+msgid "There are current changes to your timetable."
 msgstr ""
diff --git a/aleksis/apps/chronos/locale/la/LC_MESSAGES/django.po b/aleksis/apps/chronos/locale/la/LC_MESSAGES/django.po
index 64f39ae10f914f1706a38e03dc6bf944a6f71d60..279ead538768dffda25f3cdb31fb9af609117621 100644
--- a/aleksis/apps/chronos/locale/la/LC_MESSAGES/django.po
+++ b/aleksis/apps/chronos/locale/la/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-06-21 11:32+0200\n"
+"POT-Creation-Date: 2024-08-18 14:23+0200\n"
 "PO-Revision-Date: 2020-08-23 13:49+0000\n"
 "Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
 "Language-Team: Latin <https://translate.edugit.org/projects/aleksis/aleksis-app-chronos/la/>\n"
@@ -18,76 +18,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.1.1\n"
 
-#: aleksis/apps/chronos/form_extensions.py:7
-msgid "Options for timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/form_extensions.py:8
-msgid "Optional data for timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:6 aleksis/apps/chronos/preferences.py:10
-msgid "Timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:16
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:11
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:18
-msgid "My timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:27
-#: aleksis/apps/chronos/templates/chronos/all.html:11
-#: aleksis/apps/chronos/templates/chronos/all.html:12
-msgid "All timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:38
-msgid "Daily lessons"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:49
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:11
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:17
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:12
-msgid "Substitutions"
-msgstr ""
-
 #: aleksis/apps/chronos/mixins.py:25
 msgid "Linked validity range"
 msgstr ""
 
-#: aleksis/apps/chronos/model_extensions.py:142
-msgid "Show announcement in timetable views?"
-msgstr ""
-
-#: aleksis/apps/chronos/model_extensions.py:151
+#: aleksis/apps/chronos/model_extensions.py:145
 msgid "Can view group timetable"
 msgstr ""
 
-#: aleksis/apps/chronos/model_extensions.py:155
+#: aleksis/apps/chronos/model_extensions.py:149
 msgid "Can view person timetable"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:86
+#: aleksis/apps/chronos/models.py:87
 msgid "School term"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:89 aleksis/apps/chronos/models.py:699
+#: aleksis/apps/chronos/models.py:90 aleksis/apps/chronos/models.py:626
+#: aleksis/apps/chronos/models.py:1310
 msgid "Name"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:91 aleksis/apps/chronos/models.py:754
-#: aleksis/apps/chronos/models.py:827 aleksis/apps/chronos/models.py:1061
+#: aleksis/apps/chronos/models.py:92 aleksis/apps/chronos/models.py:676
+#: aleksis/apps/chronos/models.py:747 aleksis/apps/chronos/models.py:979
 msgid "Start date"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:92 aleksis/apps/chronos/models.py:755
-#: aleksis/apps/chronos/models.py:828 aleksis/apps/chronos/models.py:1062
+#: aleksis/apps/chronos/models.py:93 aleksis/apps/chronos/models.py:677
+#: aleksis/apps/chronos/models.py:748 aleksis/apps/chronos/models.py:980
 msgid "End date"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:111
+#: aleksis/apps/chronos/models.py:112
 msgid "The start date must be earlier than the end date."
 msgstr ""
 
@@ -107,628 +69,583 @@ msgstr ""
 msgid "Validity ranges"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:150
+#: aleksis/apps/chronos/models.py:149
 msgid "Week day"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:152
+#: aleksis/apps/chronos/models.py:151
 msgid "Number of period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:154
+#: aleksis/apps/chronos/models.py:153
 msgid "Start time"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:155
+#: aleksis/apps/chronos/models.py:154
 msgid "End time"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:338 aleksis/apps/chronos/models.py:525
-#: aleksis/apps/chronos/models.py:1191
+#: aleksis/apps/chronos/models.py:324 aleksis/apps/chronos/models.py:496
+#: aleksis/apps/chronos/models.py:1122
 msgid "Time period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:339
+#: aleksis/apps/chronos/models.py:325
 msgid "Time periods"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:343 aleksis/apps/chronos/models.py:364
-#: aleksis/apps/chronos/models.py:698 aleksis/apps/chronos/models.py:873
-#: aleksis/apps/chronos/models.py:895
+#: aleksis/apps/chronos/models.py:329 aleksis/apps/chronos/models.py:625
+#: aleksis/apps/chronos/models.py:793 aleksis/apps/chronos/models.py:810
 msgid "Short name"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:344 aleksis/apps/chronos/models.py:365
-#: aleksis/apps/chronos/models.py:874 aleksis/apps/chronos/models.py:896
+#: aleksis/apps/chronos/models.py:330 aleksis/apps/chronos/models.py:794
+#: aleksis/apps/chronos/models.py:811
 msgid "Long name"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:346
+#: aleksis/apps/chronos/models.py:332
 msgid "Foreground colour"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:347
+#: aleksis/apps/chronos/models.py:333
 msgid "Background colour"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:354 aleksis/apps/chronos/models.py:390
-#: aleksis/apps/chronos/models.py:446 aleksis/apps/chronos/models.py:1198
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
+#: aleksis/apps/chronos/models.py:340 aleksis/apps/chronos/models.py:349
+#: aleksis/apps/chronos/models.py:416 aleksis/apps/chronos/models.py:1129
+#: aleksis/apps/chronos/models.py:1345
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:2
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:29
 msgid "Subject"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:355
+#: aleksis/apps/chronos/models.py:341
 msgid "Subjects"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:374
-msgid "Can view room timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:376 aleksis/apps/chronos/models.py:454
-#: aleksis/apps/chronos/models.py:533 aleksis/apps/chronos/models.py:751
-#: aleksis/apps/chronos/models.py:1213
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
-msgid "Room"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:377 aleksis/apps/chronos/models.py:1078
-#: aleksis/apps/chronos/templates/chronos/all.html:45
-msgid "Rooms"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:393 aleksis/apps/chronos/models.py:452
-#: aleksis/apps/chronos/models.py:1080 aleksis/apps/chronos/models.py:1206
-#: aleksis/apps/chronos/tables.py:35
-#: aleksis/apps/chronos/templates/chronos/all.html:17
+#: aleksis/apps/chronos/models.py:352 aleksis/apps/chronos/models.py:422
+#: aleksis/apps/chronos/models.py:998 aleksis/apps/chronos/models.py:1137
+#: aleksis/apps/chronos/models.py:1338
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:3
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:28
+#: aleksis/apps/chronos/templates/chronos/supervision_event_description.txt:1
 msgid "Teachers"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:399
+#: aleksis/apps/chronos/models.py:358
 msgid "Periods"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:401 aleksis/apps/chronos/models.py:1077
-#: aleksis/apps/chronos/models.py:1201 aleksis/apps/chronos/tables.py:34
-#: aleksis/apps/chronos/templates/chronos/all.html:31
+#: aleksis/apps/chronos/models.py:360 aleksis/apps/chronos/models.py:995
+#: aleksis/apps/chronos/models.py:1132 aleksis/apps/chronos/models.py:1326
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:1
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:26
 msgid "Groups"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:424 aleksis/apps/chronos/models.py:519
-#: aleksis/apps/chronos/models.py:795
+#: aleksis/apps/chronos/models.py:394 aleksis/apps/chronos/models.py:490
+#: aleksis/apps/chronos/models.py:716 aleksis/apps/chronos/models.py:1430
+#: aleksis/apps/chronos/models.py:1454
 msgid "Lesson"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:425
-#: aleksis/apps/chronos/templates/chronos/lessons_day.html:9
-#: aleksis/apps/chronos/templates/chronos/lessons_day.html:19
+#: aleksis/apps/chronos/models.py:395 aleksis/apps/chronos/models.py:1306
 msgid "Lessons"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:433 aleksis/apps/chronos/models.py:1185
+#: aleksis/apps/chronos/models.py:403 aleksis/apps/chronos/models.py:1116
 msgid "Week"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:434 aleksis/apps/chronos/models.py:1186
+#: aleksis/apps/chronos/models.py:404 aleksis/apps/chronos/models.py:1117
 msgid "Year"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:437 aleksis/apps/chronos/models.py:654
+#: aleksis/apps/chronos/models.py:407 aleksis/apps/chronos/models.py:620
 msgid "Lesson period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:456
+#: aleksis/apps/chronos/models.py:425 aleksis/apps/chronos/models.py:504
+#: aleksis/apps/chronos/models.py:673 aleksis/apps/chronos/models.py:1144
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
+msgid "Room"
+msgstr ""
+
+#: aleksis/apps/chronos/models.py:428
 msgid "Cancelled?"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:458
+#: aleksis/apps/chronos/models.py:430
 msgid "Cancelled for teachers?"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:461 aleksis/apps/chronos/models.py:770
-#: aleksis/apps/chronos/models.py:813 aleksis/apps/chronos/models.py:1216
+#: aleksis/apps/chronos/models.py:433 aleksis/apps/chronos/models.py:692
+#: aleksis/apps/chronos/models.py:734 aleksis/apps/chronos/models.py:1147
+#: aleksis/apps/chronos/models.py:1357
 msgid "Comment"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:465
+#: aleksis/apps/chronos/models.py:437
 msgid "Lessons can only be either substituted or cancelled."
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:506
+#: aleksis/apps/chronos/models.py:477
 msgid "Lesson substitution"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:507
+#: aleksis/apps/chronos/models.py:478
 msgid "Lesson substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:655
+#: aleksis/apps/chronos/models.py:621
 msgid "Lesson periods"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:693
-msgid "Timetable widget"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:694
-msgid "Timetable widgets"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:708 aleksis/apps/chronos/models.py:726
+#: aleksis/apps/chronos/models.py:635 aleksis/apps/chronos/models.py:648
 msgid "Absence reason"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:709
+#: aleksis/apps/chronos/models.py:636
 msgid "Absence reasons"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:735 aleksis/apps/chronos/models.py:974
-#: aleksis/apps/chronos/models.py:1025
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
+#: aleksis/apps/chronos/models.py:657 aleksis/apps/chronos/models.py:889
+#: aleksis/apps/chronos/models.py:943
 msgid "Teacher"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:743
+#: aleksis/apps/chronos/models.py:665
 msgid "Group"
 msgstr "Grex"
 
-#: aleksis/apps/chronos/models.py:759 aleksis/apps/chronos/models.py:802
+#: aleksis/apps/chronos/models.py:681 aleksis/apps/chronos/models.py:723
 msgid "Start period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:766 aleksis/apps/chronos/models.py:808
+#: aleksis/apps/chronos/models.py:688 aleksis/apps/chronos/models.py:729
 msgid "End period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:780
+#: aleksis/apps/chronos/models.py:702
 msgid "Unknown absence"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:786
+#: aleksis/apps/chronos/models.py:707
 msgid "Absence"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:787
+#: aleksis/apps/chronos/models.py:708
 msgid "Absences"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:798
+#: aleksis/apps/chronos/models.py:719
 msgid "Date of exam"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:812 aleksis/apps/chronos/models.py:826
-#: aleksis/apps/chronos/models.py:1059
+#: aleksis/apps/chronos/models.py:733 aleksis/apps/chronos/models.py:746
+#: aleksis/apps/chronos/models.py:977
 msgid "Title"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:819
+#: aleksis/apps/chronos/models.py:739
 msgid "Exam"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:820
+#: aleksis/apps/chronos/models.py:740
 msgid "Exams"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:829
+#: aleksis/apps/chronos/models.py:749
 msgid "Comments"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:868
+#: aleksis/apps/chronos/models.py:788
 msgid "Holiday"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:869
+#: aleksis/apps/chronos/models.py:789
 msgid "Holidays"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:883 aleksis/apps/chronos/models.py:964
+#: aleksis/apps/chronos/models.py:803 aleksis/apps/chronos/models.py:879
 msgid "Supervision area"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:884
+#: aleksis/apps/chronos/models.py:804
 msgid "Supervision areas"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:901
+#: aleksis/apps/chronos/models.py:816
 msgid "Time period after break starts"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:909
+#: aleksis/apps/chronos/models.py:824
 msgid "Time period before break ends"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:949 aleksis/apps/chronos/models.py:968
+#: aleksis/apps/chronos/models.py:864 aleksis/apps/chronos/models.py:883
 msgid "Break"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:950
+#: aleksis/apps/chronos/models.py:865
 msgid "Breaks"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1005 aleksis/apps/chronos/models.py:1018
-#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:23
-#: aleksis/apps/chronos/templates/chronos/partials/supervision.html:15
+#: aleksis/apps/chronos/models.py:923 aleksis/apps/chronos/models.py:936
+#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:3
 msgid "Supervision"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1006
+#: aleksis/apps/chronos/models.py:924 aleksis/apps/chronos/models.py:1622
 msgid "Supervisions"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1014
+#: aleksis/apps/chronos/models.py:932
 msgid "Date"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1048
+#: aleksis/apps/chronos/models.py:966
 msgid "Supervision substitution"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1049
+#: aleksis/apps/chronos/models.py:967
 msgid "Supervision substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1067
+#: aleksis/apps/chronos/models.py:985
 msgid "Start time period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1073
+#: aleksis/apps/chronos/models.py:991
 msgid "End time period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1087
+#: aleksis/apps/chronos/models.py:996 aleksis/apps/chronos/models.py:1332
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:4
+msgid "Rooms"
+msgstr ""
+
+#: aleksis/apps/chronos/models.py:1005
 #, python-brace-format
 msgid "Event {pk}"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1172
-#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:27
+#: aleksis/apps/chronos/models.py:1103
 msgid "Event"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1173
+#: aleksis/apps/chronos/models.py:1104
 msgid "Events"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1221
+#: aleksis/apps/chronos/models.py:1152
 msgid "Related exam"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1251
+#: aleksis/apps/chronos/models.py:1181
 msgid "Extra lesson"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1252
+#: aleksis/apps/chronos/models.py:1182
 msgid "Extra lessons"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1264
+#: aleksis/apps/chronos/models.py:1194
 msgid "Number of days shown in the plan"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1268
+#: aleksis/apps/chronos/models.py:1198
 msgid "Show header box"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1269 aleksis/apps/chronos/preferences.py:61
+#: aleksis/apps/chronos/models.py:1199 aleksis/apps/chronos/preferences.py:100
 msgid "The header box shows affected teachers/groups."
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1276
+#: aleksis/apps/chronos/models.py:1206
 msgid "Revision which triggered the last update"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1337
+#: aleksis/apps/chronos/models.py:1278
 msgid "Automatic plan"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1338
+#: aleksis/apps/chronos/models.py:1279
 msgid "Automatic plans"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1352
+#: aleksis/apps/chronos/models.py:1293
 msgid "Can view all room timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1353
+#: aleksis/apps/chronos/models.py:1294
 msgid "Can view all group timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1354
+#: aleksis/apps/chronos/models.py:1295
 msgid "Can view all person timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1355
+#: aleksis/apps/chronos/models.py:1296
 msgid "Can view timetable overview"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1356
+#: aleksis/apps/chronos/models.py:1297
 msgid "Can view all lessons per day"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:18
-msgid "Use parent groups in timetable views"
+#: aleksis/apps/chronos/models.py:1298
+msgid "Can view all supervisions per day"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:20
-msgid "If an lesson or substitution has only one group and this group has parent groups, show the parent groups instead of the original group."
+#: aleksis/apps/chronos/models.py:1313
+msgid "Start slot number"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:31
-msgid "Shorten groups in timetable views"
+#: aleksis/apps/chronos/models.py:1316
+msgid "End slot number"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:32
-msgid "If there are more groups than the set limit, they will be collapsed."
+#: aleksis/apps/chronos/models.py:1320
+msgid "Course"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:40
-msgid "Limit of groups for shortening of groups"
+#: aleksis/apps/chronos/models.py:1353
+#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:4
+msgid "Cancelled"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:42
-msgid "If an user activates shortening of groups,they will be collapsed if there are more groups than this limit."
+#: aleksis/apps/chronos/models.py:1401 aleksis/apps/chronos/models.py:1413
+#: aleksis/apps/chronos/models.py:1425
+msgid "{} (instead of {})"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:52
-msgid "Number of days shown on substitutions print view"
+#: aleksis/apps/chronos/models.py:1614
+msgid "Lesson Event"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:60
-msgid "Show header box in substitution views"
+#: aleksis/apps/chronos/models.py:1615
+msgid "Lesson Events"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:70
-msgid "Show parent groups in header box in substitution views instead of original groups"
+#: aleksis/apps/chronos/models.py:1630
+msgid "Supervision: {}"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:79
-msgid "How many days in advance users should be notified about timetable changes?"
+#: aleksis/apps/chronos/preferences.py:21
+msgid "Timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:87
-msgid "Time for sending notifications about timetable changes"
+#: aleksis/apps/chronos/preferences.py:29
+msgid "Use parent groups in timetable views"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:90
-msgid "This is only used for scheduling notifications which doesn't affect the time period configured above. All other notifications affecting the next days are sent immediately."
+#: aleksis/apps/chronos/preferences.py:31
+msgid "If a lesson or substitution has only one group and this group has parent groups, show the parent groups instead of the original group."
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:101
-#: aleksis/apps/chronos/preferences.py:109
-msgid "Send notifications for current timetable changes"
+#: aleksis/apps/chronos/preferences.py:42
+msgid "Shorten groups in timetable views"
 msgstr ""
 
-#: aleksis/apps/chronos/tables.py:41
-msgid "Substitution"
+#: aleksis/apps/chronos/preferences.py:43
+msgid "If there are more groups than the set limit, they will be collapsed."
 msgstr ""
 
-#: aleksis/apps/chronos/tables.py:43
-msgid "Manage substitution"
+#: aleksis/apps/chronos/preferences.py:51
+msgid "Limit of groups for shortening of groups"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/all.html:25
-msgid "No teachers timetables available."
+#: aleksis/apps/chronos/preferences.py:53
+msgid "If a user activates shortening of groups,they will be collapsed if there are more groups than this limit."
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/all.html:39
-msgid "No group timetables available."
+#: aleksis/apps/chronos/preferences.py:65
+msgid "Relevant days for substitution plans"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/all.html:53
-msgid "No room timetables available."
+#: aleksis/apps/chronos/preferences.py:82
+msgid "Time when substitution plans switch to the next day"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:11
-msgid "Edit substitution."
+#: aleksis/apps/chronos/preferences.py:91
+msgid "Number of days shown on substitutions print view"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:12
-msgid "Edit substitution"
+#: aleksis/apps/chronos/preferences.py:99
+msgid "Show header box in substitution views"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:25
-msgid "Delete"
+#: aleksis/apps/chronos/preferences.py:109
+msgid "Show parent groups in header box in substitution views instead of original groups"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:19
-#: aleksis/apps/chronos/templates/chronos/timetable.html:50
-msgid "SMART PLAN"
+#: aleksis/apps/chronos/preferences.py:118
+msgid "How many days in advance users should be notified about timetable changes?"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:22
-msgid "Show week timetable for"
+#: aleksis/apps/chronos/preferences.py:126
+msgid "Time for sending notifications about timetable changes"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:10
-msgid "Absent teachers"
+#: aleksis/apps/chronos/preferences.py:129
+msgid "This is only used for scheduling notifications which doesn't affect the time period configured above. All other notifications affecting the next days are sent immediately."
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:22
-msgid "Absent groups"
+#: aleksis/apps/chronos/preferences.py:140
+#: aleksis/apps/chronos/preferences.py:148
+msgid "Send notifications for current timetable changes"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:34
-msgid "Affected teachers"
+#: aleksis/apps/chronos/preferences.py:158
+msgid "Group types to show in timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:46
-msgid "Affected groups"
+#: aleksis/apps/chronos/preferences.py:159
+msgid "If you leave it empty, all groups will be shown."
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/lesson.html:27
-msgid "Cancelled due to an event"
+#: aleksis/apps/chronos/preferences.py:169
+msgid "Lesson calendar feed color"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:4
-msgid "Cancelled"
+#: aleksis/apps/chronos/preferences.py:181
+msgid "Supervision calendar feed color"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:6
-msgid "Cancelled for teachers"
+#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:10
+msgid "Absent teachers"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/today.html:2
-msgid "Today"
+#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:22
+msgid "Absent groups"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:14
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:25
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:36
-msgid "CW"
+#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:34
+msgid "Affected teachers"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:49
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:31
-msgid "Notes"
+#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:46
+msgid "Affected groups"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:57
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:41
-msgid "No substitutions available."
+#: aleksis/apps/chronos/templates/chronos/partials/subs/period.html:12
+msgid "all day"
 msgstr ""
 
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:11
 msgid "Print: Substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/timetable.html:11
-#: aleksis/apps/chronos/templates/chronos/timetable.html:24
-#: aleksis/apps/chronos/templates/chronos/timetable_print.html:11
-#: aleksis/apps/chronos/util/notifications.py:206
-msgid "Timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:29
-msgid "Group teachers:"
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:55
-msgid "Show regular timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:63
-#: aleksis/apps/chronos/templates/chronos/timetable.html:84
-msgid "View class register of this week"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:12
+msgid "Substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/timetable.html:76
-msgid "Show SMART PLAN"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:27
+msgid "Time"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/widget.html:8
-#, python-format
-msgid ""
-"\n"
-"        My timetable for %(day)s\n"
-"      "
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:31
+msgid "Notes"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/widget.html:18
-msgid ""
-"\n"
-"          There is no timetable linked to your person.\n"
-"          "
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:41
+msgid "No substitutions available."
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/widget.html:27
-msgid "Go to smart plan"
+#: aleksis/apps/chronos/templates/chronos/supervision_event_description.txt:2
+msgid "Areas"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:50
+#: aleksis/apps/chronos/util/notifications.py:48
 #, python-brace-format
 msgid "The {subject} lesson in the {period}. period on {day} has been cancelled."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:57
+#: aleksis/apps/chronos/util/notifications.py:55
 #, python-brace-format
 msgid "The {subject} lesson in the {period}. period on {day} has some current changes."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:66
+#: aleksis/apps/chronos/util/notifications.py:64
 #, python-brace-format
 msgid "The teacher {old} is substituted by {new}."
 msgid_plural "The teachers {old} are substituted by {new}."
 msgstr[0] ""
 msgstr[1] ""
 
-#: aleksis/apps/chronos/util/notifications.py:78
+#: aleksis/apps/chronos/util/notifications.py:76
 #, python-brace-format
 msgid "The subject is changed to {subject}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:84
+#: aleksis/apps/chronos/util/notifications.py:82
 #, python-brace-format
 msgid "The lesson is moved from {old} to {new}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:93
+#: aleksis/apps/chronos/util/notifications.py:91
 #, python-brace-format
 msgid "There is an additional comment: {comment}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:101
+#: aleksis/apps/chronos/util/notifications.py:99
 #, python-brace-format
 msgid "There is an event that starts on {date_start}, {period_from}. period and ends on {date_end}, {period_to}. period:"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:114
+#: aleksis/apps/chronos/util/notifications.py:112
 #, python-brace-format
 msgid "There is an event on {date} from the {period_from}. period to the {period_to}. period:"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:125
-#: aleksis/apps/chronos/util/notifications.py:145
+#: aleksis/apps/chronos/util/notifications.py:123
+#: aleksis/apps/chronos/util/notifications.py:143
 #, python-brace-format
 msgid "Groups: {groups}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:127
-#: aleksis/apps/chronos/util/notifications.py:149
+#: aleksis/apps/chronos/util/notifications.py:125
+#: aleksis/apps/chronos/util/notifications.py:147
 #, python-brace-format
 msgid "Teachers: {teachers}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:130
+#: aleksis/apps/chronos/util/notifications.py:128
 #, python-brace-format
 msgid "Rooms: {rooms}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:137
+#: aleksis/apps/chronos/util/notifications.py:135
 #, python-brace-format
 msgid "There is an extra lesson on {date} in the {period}. period:"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:147
+#: aleksis/apps/chronos/util/notifications.py:145
 #, python-brace-format
 msgid "Subject: {subject}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:151
+#: aleksis/apps/chronos/util/notifications.py:149
 #, python-brace-format
 msgid "Room: {room}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:153
+#: aleksis/apps/chronos/util/notifications.py:151
 #, python-brace-format
 msgid "Comment: {comment}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:156
+#: aleksis/apps/chronos/util/notifications.py:154
 #, python-brace-format
 msgid "The supervision of {old} on {date} between the {period_from}. period and the {period_to}. period in the area {area} is substituted by {new}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:207
-msgid "There are current changes to your timetable."
-msgstr ""
-
-#: aleksis/apps/chronos/views.py:270
-msgid "The substitution has been saved."
+#: aleksis/apps/chronos/util/notifications.py:204
+msgid "Timetable"
 msgstr ""
 
-#: aleksis/apps/chronos/views.py:291
-msgid "The substitution has been deleted."
+#: aleksis/apps/chronos/util/notifications.py:205
+msgid "There are current changes to your timetable."
 msgstr ""
diff --git a/aleksis/apps/chronos/locale/nb_NO/LC_MESSAGES/django.po b/aleksis/apps/chronos/locale/nb_NO/LC_MESSAGES/django.po
index f4190ee2c3668ce8a8a236aa9dbb007292e467a9..cfc760f01b3206aaf7123340eccf529e9e4db354 100644
--- a/aleksis/apps/chronos/locale/nb_NO/LC_MESSAGES/django.po
+++ b/aleksis/apps/chronos/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: 2022-06-21 11:32+0200\n"
+"POT-Creation-Date: 2024-08-18 14:23+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,76 +17,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: aleksis/apps/chronos/form_extensions.py:7
-msgid "Options for timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/form_extensions.py:8
-msgid "Optional data for timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:6 aleksis/apps/chronos/preferences.py:10
-msgid "Timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:16
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:11
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:18
-msgid "My timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:27
-#: aleksis/apps/chronos/templates/chronos/all.html:11
-#: aleksis/apps/chronos/templates/chronos/all.html:12
-msgid "All timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:38
-msgid "Daily lessons"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:49
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:11
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:17
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:12
-msgid "Substitutions"
-msgstr ""
-
 #: aleksis/apps/chronos/mixins.py:25
 msgid "Linked validity range"
 msgstr ""
 
-#: aleksis/apps/chronos/model_extensions.py:142
-msgid "Show announcement in timetable views?"
-msgstr ""
-
-#: aleksis/apps/chronos/model_extensions.py:151
+#: aleksis/apps/chronos/model_extensions.py:145
 msgid "Can view group timetable"
 msgstr ""
 
-#: aleksis/apps/chronos/model_extensions.py:155
+#: aleksis/apps/chronos/model_extensions.py:149
 msgid "Can view person timetable"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:86
+#: aleksis/apps/chronos/models.py:87
 msgid "School term"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:89 aleksis/apps/chronos/models.py:699
+#: aleksis/apps/chronos/models.py:90 aleksis/apps/chronos/models.py:626
+#: aleksis/apps/chronos/models.py:1310
 msgid "Name"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:91 aleksis/apps/chronos/models.py:754
-#: aleksis/apps/chronos/models.py:827 aleksis/apps/chronos/models.py:1061
+#: aleksis/apps/chronos/models.py:92 aleksis/apps/chronos/models.py:676
+#: aleksis/apps/chronos/models.py:747 aleksis/apps/chronos/models.py:979
 msgid "Start date"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:92 aleksis/apps/chronos/models.py:755
-#: aleksis/apps/chronos/models.py:828 aleksis/apps/chronos/models.py:1062
+#: aleksis/apps/chronos/models.py:93 aleksis/apps/chronos/models.py:677
+#: aleksis/apps/chronos/models.py:748 aleksis/apps/chronos/models.py:980
 msgid "End date"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:111
+#: aleksis/apps/chronos/models.py:112
 msgid "The start date must be earlier than the end date."
 msgstr ""
 
@@ -106,628 +68,583 @@ msgstr ""
 msgid "Validity ranges"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:150
+#: aleksis/apps/chronos/models.py:149
 msgid "Week day"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:152
+#: aleksis/apps/chronos/models.py:151
 msgid "Number of period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:154
+#: aleksis/apps/chronos/models.py:153
 msgid "Start time"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:155
+#: aleksis/apps/chronos/models.py:154
 msgid "End time"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:338 aleksis/apps/chronos/models.py:525
-#: aleksis/apps/chronos/models.py:1191
+#: aleksis/apps/chronos/models.py:324 aleksis/apps/chronos/models.py:496
+#: aleksis/apps/chronos/models.py:1122
 msgid "Time period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:339
+#: aleksis/apps/chronos/models.py:325
 msgid "Time periods"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:343 aleksis/apps/chronos/models.py:364
-#: aleksis/apps/chronos/models.py:698 aleksis/apps/chronos/models.py:873
-#: aleksis/apps/chronos/models.py:895
+#: aleksis/apps/chronos/models.py:329 aleksis/apps/chronos/models.py:625
+#: aleksis/apps/chronos/models.py:793 aleksis/apps/chronos/models.py:810
 msgid "Short name"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:344 aleksis/apps/chronos/models.py:365
-#: aleksis/apps/chronos/models.py:874 aleksis/apps/chronos/models.py:896
+#: aleksis/apps/chronos/models.py:330 aleksis/apps/chronos/models.py:794
+#: aleksis/apps/chronos/models.py:811
 msgid "Long name"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:346
+#: aleksis/apps/chronos/models.py:332
 msgid "Foreground colour"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:347
+#: aleksis/apps/chronos/models.py:333
 msgid "Background colour"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:354 aleksis/apps/chronos/models.py:390
-#: aleksis/apps/chronos/models.py:446 aleksis/apps/chronos/models.py:1198
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
+#: aleksis/apps/chronos/models.py:340 aleksis/apps/chronos/models.py:349
+#: aleksis/apps/chronos/models.py:416 aleksis/apps/chronos/models.py:1129
+#: aleksis/apps/chronos/models.py:1345
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:2
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:29
 msgid "Subject"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:355
+#: aleksis/apps/chronos/models.py:341
 msgid "Subjects"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:374
-msgid "Can view room timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:376 aleksis/apps/chronos/models.py:454
-#: aleksis/apps/chronos/models.py:533 aleksis/apps/chronos/models.py:751
-#: aleksis/apps/chronos/models.py:1213
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
-msgid "Room"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:377 aleksis/apps/chronos/models.py:1078
-#: aleksis/apps/chronos/templates/chronos/all.html:45
-msgid "Rooms"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:393 aleksis/apps/chronos/models.py:452
-#: aleksis/apps/chronos/models.py:1080 aleksis/apps/chronos/models.py:1206
-#: aleksis/apps/chronos/tables.py:35
-#: aleksis/apps/chronos/templates/chronos/all.html:17
+#: aleksis/apps/chronos/models.py:352 aleksis/apps/chronos/models.py:422
+#: aleksis/apps/chronos/models.py:998 aleksis/apps/chronos/models.py:1137
+#: aleksis/apps/chronos/models.py:1338
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:3
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:28
+#: aleksis/apps/chronos/templates/chronos/supervision_event_description.txt:1
 msgid "Teachers"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:399
+#: aleksis/apps/chronos/models.py:358
 msgid "Periods"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:401 aleksis/apps/chronos/models.py:1077
-#: aleksis/apps/chronos/models.py:1201 aleksis/apps/chronos/tables.py:34
-#: aleksis/apps/chronos/templates/chronos/all.html:31
+#: aleksis/apps/chronos/models.py:360 aleksis/apps/chronos/models.py:995
+#: aleksis/apps/chronos/models.py:1132 aleksis/apps/chronos/models.py:1326
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:1
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:26
 msgid "Groups"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:424 aleksis/apps/chronos/models.py:519
-#: aleksis/apps/chronos/models.py:795
+#: aleksis/apps/chronos/models.py:394 aleksis/apps/chronos/models.py:490
+#: aleksis/apps/chronos/models.py:716 aleksis/apps/chronos/models.py:1430
+#: aleksis/apps/chronos/models.py:1454
 msgid "Lesson"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:425
-#: aleksis/apps/chronos/templates/chronos/lessons_day.html:9
-#: aleksis/apps/chronos/templates/chronos/lessons_day.html:19
+#: aleksis/apps/chronos/models.py:395 aleksis/apps/chronos/models.py:1306
 msgid "Lessons"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:433 aleksis/apps/chronos/models.py:1185
+#: aleksis/apps/chronos/models.py:403 aleksis/apps/chronos/models.py:1116
 msgid "Week"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:434 aleksis/apps/chronos/models.py:1186
+#: aleksis/apps/chronos/models.py:404 aleksis/apps/chronos/models.py:1117
 msgid "Year"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:437 aleksis/apps/chronos/models.py:654
+#: aleksis/apps/chronos/models.py:407 aleksis/apps/chronos/models.py:620
 msgid "Lesson period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:456
+#: aleksis/apps/chronos/models.py:425 aleksis/apps/chronos/models.py:504
+#: aleksis/apps/chronos/models.py:673 aleksis/apps/chronos/models.py:1144
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
+msgid "Room"
+msgstr ""
+
+#: aleksis/apps/chronos/models.py:428
 msgid "Cancelled?"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:458
+#: aleksis/apps/chronos/models.py:430
 msgid "Cancelled for teachers?"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:461 aleksis/apps/chronos/models.py:770
-#: aleksis/apps/chronos/models.py:813 aleksis/apps/chronos/models.py:1216
+#: aleksis/apps/chronos/models.py:433 aleksis/apps/chronos/models.py:692
+#: aleksis/apps/chronos/models.py:734 aleksis/apps/chronos/models.py:1147
+#: aleksis/apps/chronos/models.py:1357
 msgid "Comment"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:465
+#: aleksis/apps/chronos/models.py:437
 msgid "Lessons can only be either substituted or cancelled."
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:506
+#: aleksis/apps/chronos/models.py:477
 msgid "Lesson substitution"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:507
+#: aleksis/apps/chronos/models.py:478
 msgid "Lesson substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:655
+#: aleksis/apps/chronos/models.py:621
 msgid "Lesson periods"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:693
-msgid "Timetable widget"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:694
-msgid "Timetable widgets"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:708 aleksis/apps/chronos/models.py:726
+#: aleksis/apps/chronos/models.py:635 aleksis/apps/chronos/models.py:648
 msgid "Absence reason"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:709
+#: aleksis/apps/chronos/models.py:636
 msgid "Absence reasons"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:735 aleksis/apps/chronos/models.py:974
-#: aleksis/apps/chronos/models.py:1025
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
+#: aleksis/apps/chronos/models.py:657 aleksis/apps/chronos/models.py:889
+#: aleksis/apps/chronos/models.py:943
 msgid "Teacher"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:743
+#: aleksis/apps/chronos/models.py:665
 msgid "Group"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:759 aleksis/apps/chronos/models.py:802
+#: aleksis/apps/chronos/models.py:681 aleksis/apps/chronos/models.py:723
 msgid "Start period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:766 aleksis/apps/chronos/models.py:808
+#: aleksis/apps/chronos/models.py:688 aleksis/apps/chronos/models.py:729
 msgid "End period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:780
+#: aleksis/apps/chronos/models.py:702
 msgid "Unknown absence"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:786
+#: aleksis/apps/chronos/models.py:707
 msgid "Absence"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:787
+#: aleksis/apps/chronos/models.py:708
 msgid "Absences"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:798
+#: aleksis/apps/chronos/models.py:719
 msgid "Date of exam"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:812 aleksis/apps/chronos/models.py:826
-#: aleksis/apps/chronos/models.py:1059
+#: aleksis/apps/chronos/models.py:733 aleksis/apps/chronos/models.py:746
+#: aleksis/apps/chronos/models.py:977
 msgid "Title"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:819
+#: aleksis/apps/chronos/models.py:739
 msgid "Exam"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:820
+#: aleksis/apps/chronos/models.py:740
 msgid "Exams"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:829
+#: aleksis/apps/chronos/models.py:749
 msgid "Comments"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:868
+#: aleksis/apps/chronos/models.py:788
 msgid "Holiday"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:869
+#: aleksis/apps/chronos/models.py:789
 msgid "Holidays"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:883 aleksis/apps/chronos/models.py:964
+#: aleksis/apps/chronos/models.py:803 aleksis/apps/chronos/models.py:879
 msgid "Supervision area"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:884
+#: aleksis/apps/chronos/models.py:804
 msgid "Supervision areas"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:901
+#: aleksis/apps/chronos/models.py:816
 msgid "Time period after break starts"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:909
+#: aleksis/apps/chronos/models.py:824
 msgid "Time period before break ends"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:949 aleksis/apps/chronos/models.py:968
+#: aleksis/apps/chronos/models.py:864 aleksis/apps/chronos/models.py:883
 msgid "Break"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:950
+#: aleksis/apps/chronos/models.py:865
 msgid "Breaks"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1005 aleksis/apps/chronos/models.py:1018
-#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:23
-#: aleksis/apps/chronos/templates/chronos/partials/supervision.html:15
+#: aleksis/apps/chronos/models.py:923 aleksis/apps/chronos/models.py:936
+#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:3
 msgid "Supervision"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1006
+#: aleksis/apps/chronos/models.py:924 aleksis/apps/chronos/models.py:1622
 msgid "Supervisions"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1014
+#: aleksis/apps/chronos/models.py:932
 msgid "Date"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1048
+#: aleksis/apps/chronos/models.py:966
 msgid "Supervision substitution"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1049
+#: aleksis/apps/chronos/models.py:967
 msgid "Supervision substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1067
+#: aleksis/apps/chronos/models.py:985
 msgid "Start time period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1073
+#: aleksis/apps/chronos/models.py:991
 msgid "End time period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1087
+#: aleksis/apps/chronos/models.py:996 aleksis/apps/chronos/models.py:1332
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:4
+msgid "Rooms"
+msgstr ""
+
+#: aleksis/apps/chronos/models.py:1005
 #, python-brace-format
 msgid "Event {pk}"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1172
-#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:27
+#: aleksis/apps/chronos/models.py:1103
 msgid "Event"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1173
+#: aleksis/apps/chronos/models.py:1104
 msgid "Events"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1221
+#: aleksis/apps/chronos/models.py:1152
 msgid "Related exam"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1251
+#: aleksis/apps/chronos/models.py:1181
 msgid "Extra lesson"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1252
+#: aleksis/apps/chronos/models.py:1182
 msgid "Extra lessons"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1264
+#: aleksis/apps/chronos/models.py:1194
 msgid "Number of days shown in the plan"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1268
+#: aleksis/apps/chronos/models.py:1198
 msgid "Show header box"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1269 aleksis/apps/chronos/preferences.py:61
+#: aleksis/apps/chronos/models.py:1199 aleksis/apps/chronos/preferences.py:100
 msgid "The header box shows affected teachers/groups."
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1276
+#: aleksis/apps/chronos/models.py:1206
 msgid "Revision which triggered the last update"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1337
+#: aleksis/apps/chronos/models.py:1278
 msgid "Automatic plan"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1338
+#: aleksis/apps/chronos/models.py:1279
 msgid "Automatic plans"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1352
+#: aleksis/apps/chronos/models.py:1293
 msgid "Can view all room timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1353
+#: aleksis/apps/chronos/models.py:1294
 msgid "Can view all group timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1354
+#: aleksis/apps/chronos/models.py:1295
 msgid "Can view all person timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1355
+#: aleksis/apps/chronos/models.py:1296
 msgid "Can view timetable overview"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1356
+#: aleksis/apps/chronos/models.py:1297
 msgid "Can view all lessons per day"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:18
-msgid "Use parent groups in timetable views"
+#: aleksis/apps/chronos/models.py:1298
+msgid "Can view all supervisions per day"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:20
-msgid "If an lesson or substitution has only one group and this group has parent groups, show the parent groups instead of the original group."
+#: aleksis/apps/chronos/models.py:1313
+msgid "Start slot number"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:31
-msgid "Shorten groups in timetable views"
+#: aleksis/apps/chronos/models.py:1316
+msgid "End slot number"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:32
-msgid "If there are more groups than the set limit, they will be collapsed."
+#: aleksis/apps/chronos/models.py:1320
+msgid "Course"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:40
-msgid "Limit of groups for shortening of groups"
+#: aleksis/apps/chronos/models.py:1353
+#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:4
+msgid "Cancelled"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:42
-msgid "If an user activates shortening of groups,they will be collapsed if there are more groups than this limit."
+#: aleksis/apps/chronos/models.py:1401 aleksis/apps/chronos/models.py:1413
+#: aleksis/apps/chronos/models.py:1425
+msgid "{} (instead of {})"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:52
-msgid "Number of days shown on substitutions print view"
+#: aleksis/apps/chronos/models.py:1614
+msgid "Lesson Event"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:60
-msgid "Show header box in substitution views"
+#: aleksis/apps/chronos/models.py:1615
+msgid "Lesson Events"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:70
-msgid "Show parent groups in header box in substitution views instead of original groups"
+#: aleksis/apps/chronos/models.py:1630
+msgid "Supervision: {}"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:79
-msgid "How many days in advance users should be notified about timetable changes?"
+#: aleksis/apps/chronos/preferences.py:21
+msgid "Timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:87
-msgid "Time for sending notifications about timetable changes"
+#: aleksis/apps/chronos/preferences.py:29
+msgid "Use parent groups in timetable views"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:90
-msgid "This is only used for scheduling notifications which doesn't affect the time period configured above. All other notifications affecting the next days are sent immediately."
+#: aleksis/apps/chronos/preferences.py:31
+msgid "If a lesson or substitution has only one group and this group has parent groups, show the parent groups instead of the original group."
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:101
-#: aleksis/apps/chronos/preferences.py:109
-msgid "Send notifications for current timetable changes"
+#: aleksis/apps/chronos/preferences.py:42
+msgid "Shorten groups in timetable views"
 msgstr ""
 
-#: aleksis/apps/chronos/tables.py:41
-msgid "Substitution"
+#: aleksis/apps/chronos/preferences.py:43
+msgid "If there are more groups than the set limit, they will be collapsed."
 msgstr ""
 
-#: aleksis/apps/chronos/tables.py:43
-msgid "Manage substitution"
+#: aleksis/apps/chronos/preferences.py:51
+msgid "Limit of groups for shortening of groups"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/all.html:25
-msgid "No teachers timetables available."
+#: aleksis/apps/chronos/preferences.py:53
+msgid "If a user activates shortening of groups,they will be collapsed if there are more groups than this limit."
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/all.html:39
-msgid "No group timetables available."
+#: aleksis/apps/chronos/preferences.py:65
+msgid "Relevant days for substitution plans"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/all.html:53
-msgid "No room timetables available."
+#: aleksis/apps/chronos/preferences.py:82
+msgid "Time when substitution plans switch to the next day"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:11
-msgid "Edit substitution."
+#: aleksis/apps/chronos/preferences.py:91
+msgid "Number of days shown on substitutions print view"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:12
-msgid "Edit substitution"
+#: aleksis/apps/chronos/preferences.py:99
+msgid "Show header box in substitution views"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:25
-msgid "Delete"
+#: aleksis/apps/chronos/preferences.py:109
+msgid "Show parent groups in header box in substitution views instead of original groups"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:19
-#: aleksis/apps/chronos/templates/chronos/timetable.html:50
-msgid "SMART PLAN"
+#: aleksis/apps/chronos/preferences.py:118
+msgid "How many days in advance users should be notified about timetable changes?"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:22
-msgid "Show week timetable for"
+#: aleksis/apps/chronos/preferences.py:126
+msgid "Time for sending notifications about timetable changes"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:10
-msgid "Absent teachers"
+#: aleksis/apps/chronos/preferences.py:129
+msgid "This is only used for scheduling notifications which doesn't affect the time period configured above. All other notifications affecting the next days are sent immediately."
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:22
-msgid "Absent groups"
+#: aleksis/apps/chronos/preferences.py:140
+#: aleksis/apps/chronos/preferences.py:148
+msgid "Send notifications for current timetable changes"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:34
-msgid "Affected teachers"
+#: aleksis/apps/chronos/preferences.py:158
+msgid "Group types to show in timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:46
-msgid "Affected groups"
+#: aleksis/apps/chronos/preferences.py:159
+msgid "If you leave it empty, all groups will be shown."
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/lesson.html:27
-msgid "Cancelled due to an event"
+#: aleksis/apps/chronos/preferences.py:169
+msgid "Lesson calendar feed color"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:4
-msgid "Cancelled"
+#: aleksis/apps/chronos/preferences.py:181
+msgid "Supervision calendar feed color"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:6
-msgid "Cancelled for teachers"
+#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:10
+msgid "Absent teachers"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/today.html:2
-msgid "Today"
+#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:22
+msgid "Absent groups"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:14
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:25
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:36
-msgid "CW"
+#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:34
+msgid "Affected teachers"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:49
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:31
-msgid "Notes"
+#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:46
+msgid "Affected groups"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:57
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:41
-msgid "No substitutions available."
+#: aleksis/apps/chronos/templates/chronos/partials/subs/period.html:12
+msgid "all day"
 msgstr ""
 
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:11
 msgid "Print: Substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/timetable.html:11
-#: aleksis/apps/chronos/templates/chronos/timetable.html:24
-#: aleksis/apps/chronos/templates/chronos/timetable_print.html:11
-#: aleksis/apps/chronos/util/notifications.py:206
-msgid "Timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:29
-msgid "Group teachers:"
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:55
-msgid "Show regular timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:63
-#: aleksis/apps/chronos/templates/chronos/timetable.html:84
-msgid "View class register of this week"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:12
+msgid "Substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/timetable.html:76
-msgid "Show SMART PLAN"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:27
+msgid "Time"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/widget.html:8
-#, python-format
-msgid ""
-"\n"
-"        My timetable for %(day)s\n"
-"      "
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:31
+msgid "Notes"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/widget.html:18
-msgid ""
-"\n"
-"          There is no timetable linked to your person.\n"
-"          "
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:41
+msgid "No substitutions available."
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/widget.html:27
-msgid "Go to smart plan"
+#: aleksis/apps/chronos/templates/chronos/supervision_event_description.txt:2
+msgid "Areas"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:50
+#: aleksis/apps/chronos/util/notifications.py:48
 #, python-brace-format
 msgid "The {subject} lesson in the {period}. period on {day} has been cancelled."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:57
+#: aleksis/apps/chronos/util/notifications.py:55
 #, python-brace-format
 msgid "The {subject} lesson in the {period}. period on {day} has some current changes."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:66
+#: aleksis/apps/chronos/util/notifications.py:64
 #, python-brace-format
 msgid "The teacher {old} is substituted by {new}."
 msgid_plural "The teachers {old} are substituted by {new}."
 msgstr[0] ""
 msgstr[1] ""
 
-#: aleksis/apps/chronos/util/notifications.py:78
+#: aleksis/apps/chronos/util/notifications.py:76
 #, python-brace-format
 msgid "The subject is changed to {subject}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:84
+#: aleksis/apps/chronos/util/notifications.py:82
 #, python-brace-format
 msgid "The lesson is moved from {old} to {new}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:93
+#: aleksis/apps/chronos/util/notifications.py:91
 #, python-brace-format
 msgid "There is an additional comment: {comment}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:101
+#: aleksis/apps/chronos/util/notifications.py:99
 #, python-brace-format
 msgid "There is an event that starts on {date_start}, {period_from}. period and ends on {date_end}, {period_to}. period:"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:114
+#: aleksis/apps/chronos/util/notifications.py:112
 #, python-brace-format
 msgid "There is an event on {date} from the {period_from}. period to the {period_to}. period:"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:125
-#: aleksis/apps/chronos/util/notifications.py:145
+#: aleksis/apps/chronos/util/notifications.py:123
+#: aleksis/apps/chronos/util/notifications.py:143
 #, python-brace-format
 msgid "Groups: {groups}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:127
-#: aleksis/apps/chronos/util/notifications.py:149
+#: aleksis/apps/chronos/util/notifications.py:125
+#: aleksis/apps/chronos/util/notifications.py:147
 #, python-brace-format
 msgid "Teachers: {teachers}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:130
+#: aleksis/apps/chronos/util/notifications.py:128
 #, python-brace-format
 msgid "Rooms: {rooms}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:137
+#: aleksis/apps/chronos/util/notifications.py:135
 #, python-brace-format
 msgid "There is an extra lesson on {date} in the {period}. period:"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:147
+#: aleksis/apps/chronos/util/notifications.py:145
 #, python-brace-format
 msgid "Subject: {subject}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:151
+#: aleksis/apps/chronos/util/notifications.py:149
 #, python-brace-format
 msgid "Room: {room}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:153
+#: aleksis/apps/chronos/util/notifications.py:151
 #, python-brace-format
 msgid "Comment: {comment}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:156
+#: aleksis/apps/chronos/util/notifications.py:154
 #, python-brace-format
 msgid "The supervision of {old} on {date} between the {period_from}. period and the {period_to}. period in the area {area} is substituted by {new}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:207
-msgid "There are current changes to your timetable."
-msgstr ""
-
-#: aleksis/apps/chronos/views.py:270
-msgid "The substitution has been saved."
+#: aleksis/apps/chronos/util/notifications.py:204
+msgid "Timetable"
 msgstr ""
 
-#: aleksis/apps/chronos/views.py:291
-msgid "The substitution has been deleted."
+#: aleksis/apps/chronos/util/notifications.py:205
+msgid "There are current changes to your timetable."
 msgstr ""
diff --git a/aleksis/apps/chronos/locale/ru/LC_MESSAGES/django.po b/aleksis/apps/chronos/locale/ru/LC_MESSAGES/django.po
index 2e3d3057579d8be2e8deb28753aa9446c82ca06e..1b0a45605bebc00ee478a4bec86722a8d2d2e4d2 100644
--- a/aleksis/apps/chronos/locale/ru/LC_MESSAGES/django.po
+++ b/aleksis/apps/chronos/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-06-21 11:32+0200\n"
+"POT-Creation-Date: 2024-08-18 14:23+0200\n"
 "PO-Revision-Date: 2023-05-26 04:38+0000\n"
 "Last-Translator: Serhii Horichenko <m@sgg.im>\n"
 "Language-Team: Russian <https://translate.edugit.org/projects/aleksis/aleksis-app-chronos/ru/>\n"
@@ -18,76 +18,38 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 "X-Generator: Weblate 4.12.1\n"
 
-#: aleksis/apps/chronos/form_extensions.py:7
-msgid "Options for timetables"
-msgstr "ÐžÐ¿Ñ†Ð¸Ð¸ Ð´Ð»Ñ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ"
-
-#: aleksis/apps/chronos/form_extensions.py:8
-msgid "Optional data for timetables"
-msgstr "ÐžÐ¿Ñ†Ð¸Ð¾Ð½Ð°Ð»ÑŒÐ½Ñ‹Ðµ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð´Ð»Ñ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ"
-
-#: aleksis/apps/chronos/menus.py:6 aleksis/apps/chronos/preferences.py:10
-msgid "Timetables"
-msgstr "Ð Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ"
-
-#: aleksis/apps/chronos/menus.py:16
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:11
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:18
-msgid "My timetable"
-msgstr "ÐœÐ¾Ñ‘ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
-
-#: aleksis/apps/chronos/menus.py:27
-#: aleksis/apps/chronos/templates/chronos/all.html:11
-#: aleksis/apps/chronos/templates/chronos/all.html:12
-msgid "All timetables"
-msgstr "Ð’ÑÐµ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ"
-
-#: aleksis/apps/chronos/menus.py:38
-msgid "Daily lessons"
-msgstr "Ð•Ð¶ÐµÐ´Ð½ÐµÐ²Ð½Ñ‹Ðµ ÑƒÑ€Ð¾ÐºÐ¸"
-
-#: aleksis/apps/chronos/menus.py:49
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:11
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:17
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:12
-msgid "Substitutions"
-msgstr "Ð—Ð°Ð¼ÐµÐ½Ñ‹"
-
 #: aleksis/apps/chronos/mixins.py:25
 msgid "Linked validity range"
 msgstr "Ð¡Ð²ÑÐ·Ð°Ð½Ð½Ñ‹Ð¹ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½"
 
-#: aleksis/apps/chronos/model_extensions.py:142
-msgid "Show announcement in timetable views?"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð¾Ð±ÑŠÑÐ²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ñ€Ð¸ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ðµ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ?"
-
-#: aleksis/apps/chronos/model_extensions.py:151
+#: aleksis/apps/chronos/model_extensions.py:145
 msgid "Can view group timetable"
 msgstr "ÐœÐ¾Ð¶ÐµÑ‚ Ð¿Ñ€Ð¾ÑÐ¼Ð°Ñ‚Ñ€Ð¸Ð²Ð°Ñ‚ÑŒ Ð³Ñ€ÑƒÐ¿Ð¿Ð¾Ð²Ñ‹Ðµ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ"
 
-#: aleksis/apps/chronos/model_extensions.py:155
+#: aleksis/apps/chronos/model_extensions.py:149
 msgid "Can view person timetable"
 msgstr "ÐœÐ¾Ð¶ÐµÑ‚ Ð¿Ñ€Ð¾ÑÐ¼Ð°Ñ‚Ñ€Ð¸Ð²Ð°Ñ‚ÑŒ Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ"
 
-#: aleksis/apps/chronos/models.py:86
+#: aleksis/apps/chronos/models.py:87
 msgid "School term"
 msgstr "Ð£Ñ‡ÐµÐ±Ð½Ñ‹Ð¹ Ð³Ð¾Ð´"
 
-#: aleksis/apps/chronos/models.py:89 aleksis/apps/chronos/models.py:699
+#: aleksis/apps/chronos/models.py:90 aleksis/apps/chronos/models.py:626
+#: aleksis/apps/chronos/models.py:1310
 msgid "Name"
 msgstr "ÐŸÐ¾Ð»Ð½Ð¾Ðµ Ð¸Ð¼Ñ"
 
-#: aleksis/apps/chronos/models.py:91 aleksis/apps/chronos/models.py:754
-#: aleksis/apps/chronos/models.py:829 aleksis/apps/chronos/models.py:1063
+#: aleksis/apps/chronos/models.py:92 aleksis/apps/chronos/models.py:676
+#: aleksis/apps/chronos/models.py:747 aleksis/apps/chronos/models.py:979
 msgid "Start date"
 msgstr "Ð”Ð°Ñ‚Ð° Ð½Ð°Ñ‡Ð°Ð»Ð°"
 
-#: aleksis/apps/chronos/models.py:92 aleksis/apps/chronos/models.py:755
-#: aleksis/apps/chronos/models.py:830 aleksis/apps/chronos/models.py:1064
+#: aleksis/apps/chronos/models.py:93 aleksis/apps/chronos/models.py:677
+#: aleksis/apps/chronos/models.py:748 aleksis/apps/chronos/models.py:980
 msgid "End date"
 msgstr "Ð”Ð°Ñ‚Ð° Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ"
 
-#: aleksis/apps/chronos/models.py:111
+#: aleksis/apps/chronos/models.py:112
 msgid "The start date must be earlier than the end date."
 msgstr "Ð”Ð°Ñ‚Ð° Ð½Ð°Ñ‡Ð°Ð»Ð° Ð´Ð¾Ð»Ð¶Ð½Ð° Ð±Ñ‹Ñ‚ÑŒ Ñ€Ð°Ð½ÐµÐµ Ð´Ð°Ñ‚Ñ‹ Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ."
 
@@ -107,461 +69,472 @@ msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ñ‹Ð¹ Ð¿ÐµÑ€Ð¸Ð¾Ð´"
 msgid "Validity ranges"
 msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ñ‹Ðµ Ð¿ÐµÑ€Ð¸Ð¾Ð´Ñ‹"
 
-#: aleksis/apps/chronos/models.py:150
+#: aleksis/apps/chronos/models.py:149
 msgid "Week day"
 msgstr "Ð”ÐµÐ½ÑŒ Ð½ÐµÐ´ÐµÐ»Ð¸"
 
-#: aleksis/apps/chronos/models.py:152
+#: aleksis/apps/chronos/models.py:151
 msgid "Number of period"
 msgstr "ÐÐ¾Ð¼ÐµÑ€ ÑƒÑ€Ð¾ÐºÐ°"
 
-#: aleksis/apps/chronos/models.py:154
+#: aleksis/apps/chronos/models.py:153
 msgid "Start time"
 msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð½Ð°Ñ‡Ð°Ð»Ð°"
 
-#: aleksis/apps/chronos/models.py:155
+#: aleksis/apps/chronos/models.py:154
 msgid "End time"
 msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ"
 
-#: aleksis/apps/chronos/models.py:338 aleksis/apps/chronos/models.py:525
-#: aleksis/apps/chronos/models.py:1193
+#: aleksis/apps/chronos/models.py:324 aleksis/apps/chronos/models.py:496
+#: aleksis/apps/chronos/models.py:1122
 msgid "Time period"
 msgstr "Ð’Ñ€ÐµÐ¼Ñ ÑƒÑ€Ð¾ÐºÐ°"
 
-#: aleksis/apps/chronos/models.py:339
+#: aleksis/apps/chronos/models.py:325
 msgid "Time periods"
 msgstr "Ð’Ñ€ÐµÐ¼Ñ ÑƒÑ€Ð¾ÐºÐ¾Ð²"
 
-#: aleksis/apps/chronos/models.py:343 aleksis/apps/chronos/models.py:364
-#: aleksis/apps/chronos/models.py:698 aleksis/apps/chronos/models.py:875
-#: aleksis/apps/chronos/models.py:897
+#: aleksis/apps/chronos/models.py:329 aleksis/apps/chronos/models.py:625
+#: aleksis/apps/chronos/models.py:793 aleksis/apps/chronos/models.py:810
 msgid "Short name"
 msgstr "ÐšÐ¾Ñ€Ð¾Ñ‚ÐºÐ¾Ðµ Ð¸Ð¼Ñ"
 
-#: aleksis/apps/chronos/models.py:344 aleksis/apps/chronos/models.py:365
-#: aleksis/apps/chronos/models.py:876 aleksis/apps/chronos/models.py:898
+#: aleksis/apps/chronos/models.py:330 aleksis/apps/chronos/models.py:794
+#: aleksis/apps/chronos/models.py:811
 msgid "Long name"
 msgstr "Ð”Ð»Ð¸Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ"
 
-#: aleksis/apps/chronos/models.py:346
+#: aleksis/apps/chronos/models.py:332
 msgid "Foreground colour"
 msgstr "ÐžÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ Ñ†Ð²ÐµÑ‚"
 
-#: aleksis/apps/chronos/models.py:347
+#: aleksis/apps/chronos/models.py:333
 msgid "Background colour"
 msgstr "Ð¤Ð¾Ð½Ð¾Ð²Ñ‹Ð¹ Ñ†Ð²ÐµÑ‚"
 
-#: aleksis/apps/chronos/models.py:354 aleksis/apps/chronos/models.py:390
-#: aleksis/apps/chronos/models.py:446 aleksis/apps/chronos/models.py:1200
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
+#: aleksis/apps/chronos/models.py:340 aleksis/apps/chronos/models.py:349
+#: aleksis/apps/chronos/models.py:416 aleksis/apps/chronos/models.py:1129
+#: aleksis/apps/chronos/models.py:1345
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:2
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:29
 msgid "Subject"
 msgstr "ÐŸÑ€ÐµÐ´Ð¼ÐµÑ‚"
 
-#: aleksis/apps/chronos/models.py:355
+#: aleksis/apps/chronos/models.py:341
 msgid "Subjects"
 msgstr "ÐŸÑ€ÐµÐ´Ð¼ÐµÑ‚Ñ‹"
 
-#: aleksis/apps/chronos/models.py:374
-msgid "Can view room timetable"
-msgstr "ÐœÐ¾Ð¶ÐµÑ‚ Ð¿Ñ€Ð¾ÑÐ¼Ð°Ñ‚Ð¸Ð²Ð°Ñ‚ÑŒ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ ÐºÐ¾Ð¼Ð½Ð°Ñ‚Ñ‹"
-
-#: aleksis/apps/chronos/models.py:376 aleksis/apps/chronos/models.py:454
-#: aleksis/apps/chronos/models.py:533 aleksis/apps/chronos/models.py:751
-#: aleksis/apps/chronos/models.py:1215
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
-msgid "Room"
-msgstr "ÐšÐ¾Ð¼Ð½Ð°Ñ‚Ð°"
-
-#: aleksis/apps/chronos/models.py:377 aleksis/apps/chronos/models.py:1080
-#: aleksis/apps/chronos/templates/chronos/all.html:45
-msgid "Rooms"
-msgstr "ÐšÐ¾Ð¼Ð½Ð°Ñ‚Ñ‹"
-
-#: aleksis/apps/chronos/models.py:393 aleksis/apps/chronos/models.py:452
-#: aleksis/apps/chronos/models.py:1082 aleksis/apps/chronos/models.py:1208
-#: aleksis/apps/chronos/tables.py:35
-#: aleksis/apps/chronos/templates/chronos/all.html:17
+#: aleksis/apps/chronos/models.py:352 aleksis/apps/chronos/models.py:422
+#: aleksis/apps/chronos/models.py:998 aleksis/apps/chronos/models.py:1137
+#: aleksis/apps/chronos/models.py:1338
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:3
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:28
+#: aleksis/apps/chronos/templates/chronos/supervision_event_description.txt:1
 msgid "Teachers"
 msgstr "ÐŸÑ€ÐµÐ¿Ð¾Ð´Ð°Ð²Ð°Ñ‚ÐµÐ»Ð¸"
 
-#: aleksis/apps/chronos/models.py:399
+#: aleksis/apps/chronos/models.py:358
 msgid "Periods"
 msgstr "Ð§Ð°ÑÑ‹"
 
-#: aleksis/apps/chronos/models.py:401 aleksis/apps/chronos/models.py:1079
-#: aleksis/apps/chronos/models.py:1203 aleksis/apps/chronos/tables.py:34
-#: aleksis/apps/chronos/templates/chronos/all.html:31
+#: aleksis/apps/chronos/models.py:360 aleksis/apps/chronos/models.py:995
+#: aleksis/apps/chronos/models.py:1132 aleksis/apps/chronos/models.py:1326
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:1
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:26
 msgid "Groups"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ñ‹"
 
-#: aleksis/apps/chronos/models.py:424 aleksis/apps/chronos/models.py:519
-#: aleksis/apps/chronos/models.py:795
+#: aleksis/apps/chronos/models.py:394 aleksis/apps/chronos/models.py:490
+#: aleksis/apps/chronos/models.py:716 aleksis/apps/chronos/models.py:1430
+#: aleksis/apps/chronos/models.py:1454
 msgid "Lesson"
 msgstr "Ð£Ñ€Ð¾Ðº"
 
-#: aleksis/apps/chronos/models.py:425
-#: aleksis/apps/chronos/templates/chronos/lessons_day.html:9
-#: aleksis/apps/chronos/templates/chronos/lessons_day.html:19
+#: aleksis/apps/chronos/models.py:395 aleksis/apps/chronos/models.py:1306
 msgid "Lessons"
 msgstr "Ð£Ñ€Ð¾ÐºÐ¸"
 
-#: aleksis/apps/chronos/models.py:433 aleksis/apps/chronos/models.py:1187
+#: aleksis/apps/chronos/models.py:403 aleksis/apps/chronos/models.py:1116
 msgid "Week"
 msgstr "ÐÐµÐ´ÐµÐ»Ñ"
 
-#: aleksis/apps/chronos/models.py:434 aleksis/apps/chronos/models.py:1188
+#: aleksis/apps/chronos/models.py:404 aleksis/apps/chronos/models.py:1117
 msgid "Year"
 msgstr "Ð“Ð¾Ð´"
 
-#: aleksis/apps/chronos/models.py:437 aleksis/apps/chronos/models.py:654
+#: aleksis/apps/chronos/models.py:407 aleksis/apps/chronos/models.py:620
 msgid "Lesson period"
 msgstr "Ð£Ñ€Ð¾Ðº Ð¿Ð¾ Ð¿Ð¾Ñ€ÑÐ´ÐºÑƒ"
 
-#: aleksis/apps/chronos/models.py:456
+#: aleksis/apps/chronos/models.py:425 aleksis/apps/chronos/models.py:504
+#: aleksis/apps/chronos/models.py:673 aleksis/apps/chronos/models.py:1144
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
+msgid "Room"
+msgstr "ÐšÐ¾Ð¼Ð½Ð°Ñ‚Ð°"
+
+#: aleksis/apps/chronos/models.py:428
 msgid "Cancelled?"
 msgstr "ÐžÑ‚Ð¼ÐµÐ½ÐµÐ½Ð¾?"
 
-#: aleksis/apps/chronos/models.py:458
+#: aleksis/apps/chronos/models.py:430
 msgid "Cancelled for teachers?"
 msgstr "ÐžÑ‚Ð¼ÐµÐ½ÐµÐ½Ð¾ Ð´Ð»Ñ Ð¿Ñ€ÐµÐ¿Ð¾Ð´Ð°Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹?"
 
-#: aleksis/apps/chronos/models.py:461 aleksis/apps/chronos/models.py:770
-#: aleksis/apps/chronos/models.py:815 aleksis/apps/chronos/models.py:1218
+#: aleksis/apps/chronos/models.py:433 aleksis/apps/chronos/models.py:692
+#: aleksis/apps/chronos/models.py:734 aleksis/apps/chronos/models.py:1147
+#: aleksis/apps/chronos/models.py:1357
 msgid "Comment"
 msgstr "ÐšÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ð¸Ð¹"
 
-#: aleksis/apps/chronos/models.py:465
+#: aleksis/apps/chronos/models.py:437
 msgid "Lessons can only be either substituted or cancelled."
 msgstr "Ð£Ñ€Ð¾ÐºÐ¸ Ð¼Ð¾Ð³ÑƒÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ñ‹ Ð¸Ð»Ð¸ Ð¾Ñ‚Ð¼ÐµÐ½ÐµÐ½Ñ‹."
 
-#: aleksis/apps/chronos/models.py:506
+#: aleksis/apps/chronos/models.py:477
 msgid "Lesson substitution"
 msgstr "Ð—Ð°Ð¼ÐµÐ½Ð° ÑƒÑ€Ð¾ÐºÐ°"
 
-#: aleksis/apps/chronos/models.py:507
+#: aleksis/apps/chronos/models.py:478
 msgid "Lesson substitutions"
 msgstr "Ð—Ð°Ð¼ÐµÐ½Ñ‹ ÑƒÑ€Ð¾ÐºÐ¾Ð²"
 
-#: aleksis/apps/chronos/models.py:655
+#: aleksis/apps/chronos/models.py:621
 msgid "Lesson periods"
 msgstr "Ð£Ñ‡ÐµÐ±Ð½Ñ‹Ðµ Ñ‡Ð°ÑÑ‹"
 
-#: aleksis/apps/chronos/models.py:693
-msgid "Timetable widget"
-msgstr "Ð’Ð¸Ð´Ð¶ÐµÑ‚ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ"
-
-#: aleksis/apps/chronos/models.py:694
-msgid "Timetable widgets"
-msgstr "Ð’Ð¸Ð´Ð¶ÐµÑ‚Ñ‹ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ"
-
-#: aleksis/apps/chronos/models.py:708 aleksis/apps/chronos/models.py:726
+#: aleksis/apps/chronos/models.py:635 aleksis/apps/chronos/models.py:648
 msgid "Absence reason"
 msgstr "ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð° Ð¾Ñ‚ÑÑƒÑ‚ÑÑ‚Ð²Ð¸Ñ"
 
-#: aleksis/apps/chronos/models.py:709
+#: aleksis/apps/chronos/models.py:636
 msgid "Absence reasons"
 msgstr "ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ñ‹ Ð¾Ñ‚ÑÑƒÑ‚ÑÑ‚Ð²Ð¸Ñ"
 
-#: aleksis/apps/chronos/models.py:735 aleksis/apps/chronos/models.py:976
-#: aleksis/apps/chronos/models.py:1027
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
+#: aleksis/apps/chronos/models.py:657 aleksis/apps/chronos/models.py:889
+#: aleksis/apps/chronos/models.py:943
 msgid "Teacher"
 msgstr "ÐŸÑ€ÐµÐ¿Ð¾Ð´Ð°Ð²Ð°Ñ‚ÐµÐ»ÑŒ"
 
-#: aleksis/apps/chronos/models.py:743
+#: aleksis/apps/chronos/models.py:665
 msgid "Group"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð°"
 
-#: aleksis/apps/chronos/models.py:759 aleksis/apps/chronos/models.py:802
+#: aleksis/apps/chronos/models.py:681 aleksis/apps/chronos/models.py:723
 msgid "Start period"
 msgstr "ÐÐ°Ñ‡Ð°Ð»Ð¾ ÑƒÑ€Ð¾ÐºÐ¾Ð²"
 
-#: aleksis/apps/chronos/models.py:766 aleksis/apps/chronos/models.py:809
+#: aleksis/apps/chronos/models.py:688 aleksis/apps/chronos/models.py:729
 msgid "End period"
 msgstr "ÐžÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ðµ ÑƒÑ€Ð¾ÐºÐ¾Ð²"
 
-#: aleksis/apps/chronos/models.py:780
+#: aleksis/apps/chronos/models.py:702
 msgid "Unknown absence"
 msgstr "ÐžÑ‚ÑÑƒÑ‚ÑÑ‚Ð²Ð¸Ðµ Ð±ÐµÐ· ÑƒÐ²Ð°Ð¶Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ñ‹"
 
-#: aleksis/apps/chronos/models.py:786
+#: aleksis/apps/chronos/models.py:707
 msgid "Absence"
 msgstr "ÐžÑ‚ÑÑƒÑ‚ÑÑ‚Ð²Ð¸Ðµ"
 
-#: aleksis/apps/chronos/models.py:787
+#: aleksis/apps/chronos/models.py:708
 msgid "Absences"
 msgstr "ÐŸÑ€Ð¾Ð¿ÑƒÑÐºÐ¸"
 
-#: aleksis/apps/chronos/models.py:798
+#: aleksis/apps/chronos/models.py:719
 msgid "Date of exam"
 msgstr "Ð”Ð°Ñ‚Ð° ÑÐºÐ·Ð°Ð¼ÐµÐ½Ð°"
 
-#: aleksis/apps/chronos/models.py:814 aleksis/apps/chronos/models.py:828
-#: aleksis/apps/chronos/models.py:1061
+#: aleksis/apps/chronos/models.py:733 aleksis/apps/chronos/models.py:746
+#: aleksis/apps/chronos/models.py:977
 msgid "Title"
 msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ"
 
-#: aleksis/apps/chronos/models.py:821
+#: aleksis/apps/chronos/models.py:739
 msgid "Exam"
 msgstr "ÐÐºÐ·Ð°Ð¼ÐµÐ½"
 
-#: aleksis/apps/chronos/models.py:822
+#: aleksis/apps/chronos/models.py:740
 msgid "Exams"
 msgstr "ÐÐºÐ·Ð°Ð¼ÐµÐ½Ñ‹"
 
-#: aleksis/apps/chronos/models.py:831
+#: aleksis/apps/chronos/models.py:749
 msgid "Comments"
 msgstr "ÐšÐ¾Ð¼Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ð¸Ð¸"
 
-#: aleksis/apps/chronos/models.py:870
+#: aleksis/apps/chronos/models.py:788
 msgid "Holiday"
 msgstr "Ð’Ñ‹Ñ…Ð¾Ð´Ð½Ð¾Ð¹"
 
-#: aleksis/apps/chronos/models.py:871
+#: aleksis/apps/chronos/models.py:789
 msgid "Holidays"
 msgstr "Ð’Ñ‹Ñ…Ð¾Ð´Ð½Ñ‹Ðµ"
 
-#: aleksis/apps/chronos/models.py:885 aleksis/apps/chronos/models.py:966
+#: aleksis/apps/chronos/models.py:803 aleksis/apps/chronos/models.py:879
 msgid "Supervision area"
 msgstr "Ð—Ð¾Ð½Ð° ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ñ"
 
-#: aleksis/apps/chronos/models.py:886
+#: aleksis/apps/chronos/models.py:804
 msgid "Supervision areas"
 msgstr "Ð—Ð¾Ð½Ñ‹ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ñ"
 
-#: aleksis/apps/chronos/models.py:903
+#: aleksis/apps/chronos/models.py:816
 msgid "Time period after break starts"
 msgstr "Ð£Ñ‡Ñ‘Ð±Ð° Ð¿Ð¾ÑÐ»Ðµ Ð¿ÐµÑ€ÐµÑ€Ñ‹Ð²Ð° Ð½Ð°Ñ‡Ð¸Ð½Ð°ÐµÑ‚ÑÑ"
 
-#: aleksis/apps/chronos/models.py:911
+#: aleksis/apps/chronos/models.py:824
 msgid "Time period before break ends"
 msgstr "Ð£Ñ‡Ñ‘Ð±Ð° Ð¿ÐµÑ€ÐµÐ´ Ð¿ÐµÑ€ÐµÑ€Ñ‹Ð²Ð¾Ð¼ Ð·Ð°ÐºÐ°Ð½Ñ‡Ð¸Ð²Ð°ÐµÑ‚ÑÑ"
 
-#: aleksis/apps/chronos/models.py:951 aleksis/apps/chronos/models.py:970
+#: aleksis/apps/chronos/models.py:864 aleksis/apps/chronos/models.py:883
 msgid "Break"
 msgstr "ÐŸÐµÑ€ÐµÑ€Ñ‹Ð²"
 
-#: aleksis/apps/chronos/models.py:952
+#: aleksis/apps/chronos/models.py:865
 msgid "Breaks"
 msgstr "ÐŸÐµÑ€ÐµÑ€Ñ‹Ð²Ñ‹"
 
-#: aleksis/apps/chronos/models.py:1007 aleksis/apps/chronos/models.py:1020
-#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:23
-#: aleksis/apps/chronos/templates/chronos/partials/supervision.html:15
+#: aleksis/apps/chronos/models.py:923 aleksis/apps/chronos/models.py:936
+#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:3
 msgid "Supervision"
 msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒ"
 
-#: aleksis/apps/chronos/models.py:1008
+#: aleksis/apps/chronos/models.py:924 aleksis/apps/chronos/models.py:1622
 msgid "Supervisions"
 msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð¸"
 
-#: aleksis/apps/chronos/models.py:1016
+#: aleksis/apps/chronos/models.py:932
 msgid "Date"
 msgstr "Ð”Ð°Ñ‚Ð°"
 
-#: aleksis/apps/chronos/models.py:1050
+#: aleksis/apps/chronos/models.py:966
 msgid "Supervision substitution"
 msgstr "Ð—Ð°Ð¼ÐµÐ½Ð° ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ñ"
 
-#: aleksis/apps/chronos/models.py:1051
+#: aleksis/apps/chronos/models.py:967
 msgid "Supervision substitutions"
 msgstr "Ð—Ð°Ð¼ÐµÐ½Ñ‹ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ñ"
 
-#: aleksis/apps/chronos/models.py:1069
+#: aleksis/apps/chronos/models.py:985
 msgid "Start time period"
 msgstr "ÐÐ°Ñ‡Ð°Ð»Ð¾ ÑƒÑ€Ð¾ÐºÐ°"
 
-#: aleksis/apps/chronos/models.py:1075
+#: aleksis/apps/chronos/models.py:991
 msgid "End time period"
 msgstr "ÐšÐ¾Ð½ÐµÑ† ÑƒÑ€Ð¾ÐºÐ°"
 
-#: aleksis/apps/chronos/models.py:1089
+#: aleksis/apps/chronos/models.py:996 aleksis/apps/chronos/models.py:1332
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:4
+msgid "Rooms"
+msgstr "ÐšÐ¾Ð¼Ð½Ð°Ñ‚Ñ‹"
+
+#: aleksis/apps/chronos/models.py:1005
 #, python-brace-format
 msgid "Event {pk}"
 msgstr "Ð¡Ð¾Ð±Ñ‹Ñ‚Ð¸Ðµ {pk}"
 
-#: aleksis/apps/chronos/models.py:1174
-#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:27
+#: aleksis/apps/chronos/models.py:1103
 msgid "Event"
 msgstr "Ð¡Ð¾Ð±Ñ‹Ñ‚Ð¸Ðµ"
 
-#: aleksis/apps/chronos/models.py:1175
+#: aleksis/apps/chronos/models.py:1104
 msgid "Events"
 msgstr "Ð¡Ð¾Ð±Ñ‹Ñ‚Ð¸Ñ"
 
-#: aleksis/apps/chronos/models.py:1221
+#: aleksis/apps/chronos/models.py:1152
 msgid "Related exam"
 msgstr "Ð¡Ð²ÑÐ·Ð°Ð½Ð½Ñ‹Ðµ ÑÐºÐ·Ð°Ð¼ÐµÐ½Ñ‹"
 
-#: aleksis/apps/chronos/models.py:1244
+#: aleksis/apps/chronos/models.py:1181
 msgid "Extra lesson"
 msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ ÑƒÑ€Ð¾Ðº"
 
-#: aleksis/apps/chronos/models.py:1245
+#: aleksis/apps/chronos/models.py:1182
 msgid "Extra lessons"
 msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ ÑƒÑ€Ð¾ÐºÐ¸"
 
-#: aleksis/apps/chronos/models.py:1257
+#: aleksis/apps/chronos/models.py:1194
 msgid "Number of days shown in the plan"
 msgstr "ÐšÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ð´Ð½ÐµÐ¹ Ð´Ð»Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð² Ð¿Ð»Ð°Ð½Ðµ"
 
-#: aleksis/apps/chronos/models.py:1261
+#: aleksis/apps/chronos/models.py:1198
 msgid "Show header box"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº"
 
-#: aleksis/apps/chronos/models.py:1262 aleksis/apps/chronos/preferences.py:61
+#: aleksis/apps/chronos/models.py:1199 aleksis/apps/chronos/preferences.py:100
 msgid "The header box shows affected teachers/groups."
 msgstr "Ð—Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÑ‚ Ð¿Ñ€ÐµÐ¿Ð¾Ð´Ð°Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹/Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹, Ð½Ð° ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… Ð²Ð»Ð¸ÑÐµÑ‚."
 
-#: aleksis/apps/chronos/models.py:1269
+#: aleksis/apps/chronos/models.py:1206
 msgid "Revision which triggered the last update"
 msgstr "Ð ÐµÐ²Ð¸Ð·Ð¸Ñ, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð²Ñ‹Ð·Ð²Ð°Ð»Ð° Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÐµÐµ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ"
 
-#: aleksis/apps/chronos/models.py:1330
+#: aleksis/apps/chronos/models.py:1278
 msgid "Automatic plan"
 msgstr "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸Ð¹ Ð¿Ð»Ð°Ð½"
 
-#: aleksis/apps/chronos/models.py:1331
+#: aleksis/apps/chronos/models.py:1279
 msgid "Automatic plans"
 msgstr "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸Ðµ Ð¿Ð»Ð°Ð½Ñ‹"
 
-#: aleksis/apps/chronos/models.py:1345
+#: aleksis/apps/chronos/models.py:1293
 msgid "Can view all room timetables"
 msgstr "ÐœÐ¾Ð¶ÐµÑ‚ Ð¿Ñ€Ð¾ÑÐ¼Ð°Ñ‚Ñ€Ð¸Ð²Ð°Ñ‚ÑŒ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ Ð²ÑÐµÑ… ÐºÐ¾Ð¼Ð½Ð°Ñ‚"
 
-#: aleksis/apps/chronos/models.py:1346
+#: aleksis/apps/chronos/models.py:1294
 msgid "Can view all group timetables"
 msgstr "ÐœÐ¾Ð¶ÐµÑ‚ Ð¿Ñ€Ð¾ÑÐ¼Ð°Ñ‚Ñ€Ð¸Ð²Ð°Ñ‚ÑŒ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ Ð²ÑÐµÑ… Ð³Ñ€ÑƒÐ¿Ð¿"
 
-#: aleksis/apps/chronos/models.py:1347
+#: aleksis/apps/chronos/models.py:1295
 msgid "Can view all person timetables"
 msgstr "ÐœÐ¾Ð¶ÐµÑ‚ Ð¿Ñ€Ð¾ÑÐ¼Ð°Ñ‚Ñ€Ð¸Ð²Ð°Ñ‚ÑŒ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ Ð²ÑÐµÑ… Ð»ÑŽÐ´ÐµÐ¹"
 
-#: aleksis/apps/chronos/models.py:1348
+#: aleksis/apps/chronos/models.py:1296
 msgid "Can view timetable overview"
 msgstr "ÐœÐ¾Ð¶ÐµÑ‚ Ð¿Ñ€Ð¾ÑÐ¼Ð°Ñ‚Ñ€Ð¸Ð²Ð°Ñ‚ÑŒ Ð¾Ð±Ñ‰ÐµÐµ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
 
-#: aleksis/apps/chronos/models.py:1349
+#: aleksis/apps/chronos/models.py:1297
 msgid "Can view all lessons per day"
 msgstr "ÐœÐ¾Ð¶ÐµÑ‚ Ð¿Ñ€Ð¾ÑÐ¼Ð°Ñ‚Ñ€Ð¸Ð²Ð°Ñ‚ÑŒ Ð²ÑÐµ ÑƒÑ€Ð¾ÐºÐ¸ Ð·Ð° Ð´ÐµÐ½ÑŒ"
 
-#: aleksis/apps/chronos/preferences.py:18
-msgid "Use parent groups in timetable views"
-msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ñ€Ð¾Ð´Ð¸Ñ‚ÐµÐ»ÑŒÑÐºÐ¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ð² Ð¾Ð±Ð·Ð¾Ñ€Ð°Ñ… Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ"
+#: aleksis/apps/chronos/models.py:1298
+#, fuzzy
+#| msgid "Can view all lessons per day"
+msgid "Can view all supervisions per day"
+msgstr "ÐœÐ¾Ð¶ÐµÑ‚ Ð¿Ñ€Ð¾ÑÐ¼Ð°Ñ‚Ñ€Ð¸Ð²Ð°Ñ‚ÑŒ Ð²ÑÐµ ÑƒÑ€Ð¾ÐºÐ¸ Ð·Ð° Ð´ÐµÐ½ÑŒ"
 
-#: aleksis/apps/chronos/preferences.py:20
-msgid ""
-"If an lesson or substitution has only one group and this group has parent "
-"groups, show the parent groups instead of the original group."
+#: aleksis/apps/chronos/models.py:1313
+#, fuzzy
+#| msgid "Start time"
+msgid "Start slot number"
+msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð½Ð°Ñ‡Ð°Ð»Ð°"
+
+#: aleksis/apps/chronos/models.py:1316
+#, fuzzy
+#| msgid "End time"
+msgid "End slot number"
+msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ"
+
+#: aleksis/apps/chronos/models.py:1320
+msgid "Course"
+msgstr ""
+
+#: aleksis/apps/chronos/models.py:1353
+#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:4
+msgid "Cancelled"
+msgstr "ÐžÑ‚Ð¼ÐµÐ½ÐµÐ½Ð¾"
+
+#: aleksis/apps/chronos/models.py:1401 aleksis/apps/chronos/models.py:1413
+#: aleksis/apps/chronos/models.py:1425
+msgid "{} (instead of {})"
 msgstr ""
-"Ð•ÑÐ»Ð¸ Ñƒ ÑƒÑ€Ð¾ÐºÐ° Ð¸Ð»Ð¸ Ñƒ Ð·Ð°Ð¼ÐµÐ½Ñ‹ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð¾Ð´Ð½Ð° Ð³Ñ€ÑƒÐ¿Ð¿Ð° Ð¸ Ñƒ ÑÑ‚Ð¾Ð¹ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ ÐµÑÑ‚ÑŒ "
-"Ñ€Ð¾Ð´Ð¸Ñ‚ÐµÐ»ÑŒÑÐºÐ¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹, Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚ÑŒ Ð¸Ñ… Ð²Ð¼ÐµÑÑ‚Ð¾ Ð¾Ñ€Ð¸Ð³Ð¸Ð½Ð°Ð»ÑŒÐ½Ð¾Ð¹ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹."
+
+#: aleksis/apps/chronos/models.py:1614
+#, fuzzy
+#| msgid "Lesson"
+msgid "Lesson Event"
+msgstr "Ð£Ñ€Ð¾Ðº"
+
+#: aleksis/apps/chronos/models.py:1615
+#, fuzzy
+#| msgid "Lessons"
+msgid "Lesson Events"
+msgstr "Ð£Ñ€Ð¾ÐºÐ¸"
+
+#: aleksis/apps/chronos/models.py:1630
+#, fuzzy
+#| msgid "Supervision"
+msgid "Supervision: {}"
+msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒ"
+
+#: aleksis/apps/chronos/preferences.py:21
+msgid "Timetables"
+msgstr "Ð Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ"
+
+#: aleksis/apps/chronos/preferences.py:29
+msgid "Use parent groups in timetable views"
+msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ñ€Ð¾Ð´Ð¸Ñ‚ÐµÐ»ÑŒÑÐºÐ¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ð² Ð¾Ð±Ð·Ð¾Ñ€Ð°Ñ… Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ"
 
 #: aleksis/apps/chronos/preferences.py:31
+#, fuzzy
+#| msgid "If an lesson or substitution has only one group and this group has parent groups, show the parent groups instead of the original group."
+msgid "If a lesson or substitution has only one group and this group has parent groups, show the parent groups instead of the original group."
+msgstr "Ð•ÑÐ»Ð¸ Ñƒ ÑƒÑ€Ð¾ÐºÐ° Ð¸Ð»Ð¸ Ñƒ Ð·Ð°Ð¼ÐµÐ½Ñ‹ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð¾Ð´Ð½Ð° Ð³Ñ€ÑƒÐ¿Ð¿Ð° Ð¸ Ñƒ ÑÑ‚Ð¾Ð¹ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ ÐµÑÑ‚ÑŒ Ñ€Ð¾Ð´Ð¸Ñ‚ÐµÐ»ÑŒÑÐºÐ¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹, Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚ÑŒ Ð¸Ñ… Ð²Ð¼ÐµÑÑ‚Ð¾ Ð¾Ñ€Ð¸Ð³Ð¸Ð½Ð°Ð»ÑŒÐ½Ð¾Ð¹ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹."
+
+#: aleksis/apps/chronos/preferences.py:42
 msgid "Shorten groups in timetable views"
 msgstr "Ð¡Ð¾ÐºÑ€Ð°Ñ‰Ð°Ñ‚ÑŒ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ð² Ð¾Ð±Ð·Ð¾Ñ€Ð°Ñ… Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ"
 
-#: aleksis/apps/chronos/preferences.py:32
+#: aleksis/apps/chronos/preferences.py:43
 msgid "If there are more groups than the set limit, they will be collapsed."
-msgstr ""
-"Ð•ÑÐ»Ð¸ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ð³Ñ€ÑƒÐ¿Ð¿ Ð±Ð¾Ð»ÑŒÑˆÐµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð»Ð¸Ð¼Ð¸Ñ‚Ð°, Ð¾Ð½Ð¸ Ð±ÑƒÐ´ÑƒÑ‚ ÑÐ³Ñ€ÑƒÐ¿Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ñ‹."
+msgstr "Ð•ÑÐ»Ð¸ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ð³Ñ€ÑƒÐ¿Ð¿ Ð±Ð¾Ð»ÑŒÑˆÐµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð»Ð¸Ð¼Ð¸Ñ‚Ð°, Ð¾Ð½Ð¸ Ð±ÑƒÐ´ÑƒÑ‚ ÑÐ³Ñ€ÑƒÐ¿Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ñ‹."
 
-#: aleksis/apps/chronos/preferences.py:40
+#: aleksis/apps/chronos/preferences.py:51
 msgid "Limit of groups for shortening of groups"
 msgstr "Ð›Ð¸Ð¼Ð¸Ñ‚ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð° Ð³Ñ€ÑƒÐ¿Ð¿ Ð´Ð»Ñ ÑÐ¾ÐºÑ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð³Ñ€ÑƒÐ¿Ð¿"
 
-#: aleksis/apps/chronos/preferences.py:42
-msgid ""
-"If an user activates shortening of groups,they will be collapsed if there "
-"are more groups than this limit."
+#: aleksis/apps/chronos/preferences.py:53
+#, fuzzy
+#| msgid "If an user activates shortening of groups,they will be collapsed if there are more groups than this limit."
+msgid "If a user activates shortening of groups,they will be collapsed if there are more groups than this limit."
+msgstr "Ð•ÑÐ»Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Ð°ÐºÑ‚Ð¸Ð²Ð¸Ñ€ÑƒÐµÑ‚ ÑÐ¾ÐºÑ€Ð°Ñ‰ÐµÐ½Ð¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿ Ð¸ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ð±Ð¾Ð»ÑŒÑˆÐµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð»Ð¸Ð¼Ð¸Ñ‚Ð°, Ð¾Ð½Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ð¸Ñ€ÑƒÑŽÑ‚ÑÑ."
+
+#: aleksis/apps/chronos/preferences.py:65
+#, fuzzy
+#| msgid "Lesson substitutions"
+msgid "Relevant days for substitution plans"
+msgstr "Ð—Ð°Ð¼ÐµÐ½Ñ‹ ÑƒÑ€Ð¾ÐºÐ¾Ð²"
+
+#: aleksis/apps/chronos/preferences.py:82
+msgid "Time when substitution plans switch to the next day"
 msgstr ""
-"Ð•ÑÐ»Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Ð°ÐºÑ‚Ð¸Ð²Ð¸Ñ€ÑƒÐµÑ‚ ÑÐ¾ÐºÑ€Ð°Ñ‰ÐµÐ½Ð¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿ Ð¸ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ð±Ð¾Ð»ÑŒÑˆÐµ "
-"ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð»Ð¸Ð¼Ð¸Ñ‚Ð°, Ð¾Ð½Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ð¸Ñ€ÑƒÑŽÑ‚ÑÑ."
 
-#: aleksis/apps/chronos/preferences.py:52
+#: aleksis/apps/chronos/preferences.py:91
 msgid "Number of days shown on substitutions print view"
 msgstr "ÐšÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ð´Ð½ÐµÐ¹ Ð´Ð»Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð² Ð¿ÐµÑ‡Ð°Ñ‚Ð½Ð¾Ð¼ Ð²Ð¸Ð´Ðµ Ð·Ð°Ð¼ÐµÐ½"
 
-#: aleksis/apps/chronos/preferences.py:60
+#: aleksis/apps/chronos/preferences.py:99
 msgid "Show header box in substitution views"
 msgstr "ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚ÑŒ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð² Ð¾Ð±Ð·Ð¾Ñ€Ðµ Ð·Ð°Ð¼ÐµÐ½"
 
-#: aleksis/apps/chronos/preferences.py:70
-msgid ""
-"Show parent groups in header box in substitution views instead of original "
-"groups"
-msgstr ""
-"Ð’ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐµ Ð¾Ð±Ð·Ð¾Ñ€Ð° Ð·Ð°Ð¼ÐµÐ½ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚ÑŒ Ñ€Ð¾Ð´Ð¸Ñ‚ÐµÐ»ÑŒÑÐºÐ¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ð²Ð¼ÐµÑÑ‚Ð¾ Ð¾Ñ€Ð¸Ð³Ð¸Ð½Ð°Ð»ÑŒÐ½Ñ‹Ñ…"
+#: aleksis/apps/chronos/preferences.py:109
+msgid "Show parent groups in header box in substitution views instead of original groups"
+msgstr "Ð’ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐµ Ð¾Ð±Ð·Ð¾Ñ€Ð° Ð·Ð°Ð¼ÐµÐ½ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚ÑŒ Ñ€Ð¾Ð´Ð¸Ñ‚ÐµÐ»ÑŒÑÐºÐ¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ð²Ð¼ÐµÑÑ‚Ð¾ Ð¾Ñ€Ð¸Ð³Ð¸Ð½Ð°Ð»ÑŒÐ½Ñ‹Ñ…"
 
-#: aleksis/apps/chronos/preferences.py:79
-msgid ""
-"How many days in advance users should be notified about timetable changes?"
-msgstr ""
-"Ð—Ð° ÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð´Ð½ÐµÐ¹ Ð´Ð¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð² Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ð¸ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÑÑ‚ÑŒ "
-"Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹?"
+#: aleksis/apps/chronos/preferences.py:118
+msgid "How many days in advance users should be notified about timetable changes?"
+msgstr "Ð—Ð° ÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð´Ð½ÐµÐ¹ Ð´Ð¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð² Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ð¸ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÑÑ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹?"
 
-#: aleksis/apps/chronos/preferences.py:87
+#: aleksis/apps/chronos/preferences.py:126
 msgid "Time for sending notifications about timetable changes"
 msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ð¹ Ð¾Ð± Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸ÑÑ… Ð² Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ð¸"
 
-#: aleksis/apps/chronos/preferences.py:90
-msgid ""
-"This is only used for scheduling notifications which doesn't affect the time "
-"period configured above. All other notifications affecting the next days are "
-"sent immediately."
-msgstr ""
-"ÐÑ‚Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ð¿Ð»Ð°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ð¹, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð½Ðµ Ð²Ð»Ð¸ÑÑŽÑ‚ Ð½Ð° "
-"Ð²Ñ€ÐµÐ¼Ñ ÑƒÑ€Ð¾ÐºÐ¾Ð², Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½Ð½Ñ‹Ñ… Ð²Ñ‹ÑˆÐµ. Ð’ÑÐµ Ð´Ñ€ÑƒÐ³Ð¸Ðµ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð²Ð»Ð¸ÑÑŽÑ‚ Ð½Ð° "
-"Ð±Ð»Ð¸Ð¶Ð°Ð¹ÑˆÐ¸Ðµ Ð´Ð½Ð¸, Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÑÑŽÑ‚ÑÑ Ð½ÐµÐ·Ð°Ð¼ÐµÐ´Ð»Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾."
+#: aleksis/apps/chronos/preferences.py:129
+msgid "This is only used for scheduling notifications which doesn't affect the time period configured above. All other notifications affecting the next days are sent immediately."
+msgstr "ÐÑ‚Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ð¿Ð»Ð°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ð¹, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð½Ðµ Ð²Ð»Ð¸ÑÑŽÑ‚ Ð½Ð° Ð²Ñ€ÐµÐ¼Ñ ÑƒÑ€Ð¾ÐºÐ¾Ð², Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½Ð½Ñ‹Ñ… Ð²Ñ‹ÑˆÐµ. Ð’ÑÐµ Ð´Ñ€ÑƒÐ³Ð¸Ðµ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð²Ð»Ð¸ÑÑŽÑ‚ Ð½Ð° Ð±Ð»Ð¸Ð¶Ð°Ð¹ÑˆÐ¸Ðµ Ð´Ð½Ð¸, Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÑÑŽÑ‚ÑÑ Ð½ÐµÐ·Ð°Ð¼ÐµÐ´Ð»Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾."
 
-#: aleksis/apps/chronos/preferences.py:101
-#: aleksis/apps/chronos/preferences.py:109
+#: aleksis/apps/chronos/preferences.py:140
+#: aleksis/apps/chronos/preferences.py:148
 msgid "Send notifications for current timetable changes"
 msgstr "ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ… Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸ÑÑ… Ð² Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ð¸"
 
-#: aleksis/apps/chronos/tables.py:41
-msgid "Substitution"
-msgstr "Ð—Ð°Ð¼ÐµÐ½Ð°"
-
-#: aleksis/apps/chronos/tables.py:43
-msgid "Manage substitution"
-msgstr "Ð£Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð·Ð°Ð¼ÐµÐ½Ð°Ð¼Ð¸"
-
-#: aleksis/apps/chronos/templates/chronos/all.html:25
-msgid "No teachers timetables available."
-msgstr "Ð Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ Ð¿Ñ€ÐµÐ¿Ð¾Ð´Ð°Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹."
-
-#: aleksis/apps/chronos/templates/chronos/all.html:39
-msgid "No group timetables available."
-msgstr "Ð Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ Ð³Ñ€ÑƒÐ¿Ð¿ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹."
-
-#: aleksis/apps/chronos/templates/chronos/all.html:53
-msgid "No room timetables available."
-msgstr "Ð Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð½Ð°Ñ‚ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹."
-
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:6
-msgid "Edit substitution."
-msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð°Ð¼ÐµÐ½Ñƒ."
-
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:7
-msgid "Edit substitution"
-msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð°Ð¼ÐµÐ½Ñƒ"
+#: aleksis/apps/chronos/preferences.py:158
+#, fuzzy
+#| msgid "Shorten groups in timetable views"
+msgid "Group types to show in timetables"
+msgstr "Ð¡Ð¾ÐºÑ€Ð°Ñ‰Ð°Ñ‚ÑŒ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ð² Ð¾Ð±Ð·Ð¾Ñ€Ð°Ñ… Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ"
 
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:20
-msgid "Delete"
-msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
+#: aleksis/apps/chronos/preferences.py:159
+msgid "If you leave it empty, all groups will be shown."
+msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:19
-#: aleksis/apps/chronos/templates/chronos/timetable.html:50
-msgid "SMART PLAN"
-msgstr "SMART PLAN"
+#: aleksis/apps/chronos/preferences.py:169
+msgid "Lesson calendar feed color"
+msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:22
-msgid "Show week timetable for"
-msgstr "ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð·Ð¸Ñ‚ÑŒ Ð½ÐµÐ´ÐµÐ»ÑŒÐ½Ð¾Ðµ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð´Ð»Ñ"
+#: aleksis/apps/chronos/preferences.py:181
+#, fuzzy
+#| msgid "Supervision area"
+msgid "Supervision calendar feed color"
+msgstr "Ð—Ð¾Ð½Ð° ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ñ"
 
 #: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:10
 msgid "Absent teachers"
@@ -579,104 +552,47 @@ msgstr "ÐÐ° ÐºÐ°ÐºÐ¸Ñ… Ð¿Ñ€ÐµÐ¿Ð¾Ð´Ð°Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð²Ð»Ð¸ÑÐµÑ‚"
 msgid "Affected groups"
 msgstr "ÐÐ° ÐºÐ°ÐºÐ¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ð²Ð»Ð¸ÑÐµÑ‚"
 
-#: aleksis/apps/chronos/templates/chronos/partials/lesson.html:27
-msgid "Cancelled due to an event"
-msgstr "ÐžÑ‚Ð¼ÐµÐ½ÐµÐ½Ð¾ Ð¸Ð·-Ð·Ð° ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ"
-
-#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:4
-msgid "Cancelled"
-msgstr "ÐžÑ‚Ð¼ÐµÐ½ÐµÐ½Ð¾"
+#: aleksis/apps/chronos/templates/chronos/partials/subs/period.html:12
+msgid "all day"
+msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:6
-msgid "Cancelled for teachers"
-msgstr "ÐžÑ‚Ð¼ÐµÐ½ÐµÐ½Ð¾ Ð´Ð»Ñ Ð¿Ñ€ÐµÐ¿Ð¾Ð´Ð°Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:11
+msgid "Print: Substitutions"
+msgstr "ÐŸÐµÑ‡Ð°Ñ‚ÑŒ: Ð—Ð°Ð¼ÐµÐ½Ñ‹"
 
-#: aleksis/apps/chronos/templates/chronos/partials/today.html:2
-msgid "Today"
-msgstr "Ð¡ÐµÐ³Ð¾Ð´Ð½Ñ"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:12
+msgid "Substitutions"
+msgstr "Ð—Ð°Ð¼ÐµÐ½Ñ‹"
 
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:14
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:25
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:36
-msgid "CW"
-msgstr "ÐÐ”"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:27
+#, fuzzy
+#| msgid "Timetable"
+msgid "Time"
+msgstr "Ð Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
 
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:49
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:31
 msgid "Notes"
 msgstr "Ð—Ð°Ð¼ÐµÑ‚ÐºÐ¸"
 
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:57
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:41
 msgid "No substitutions available."
 msgstr "Ð—Ð°Ð¼ÐµÐ½Ñ‹ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹."
 
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:11
-msgid "Print: Substitutions"
-msgstr "ÐŸÐµÑ‡Ð°Ñ‚ÑŒ: Ð—Ð°Ð¼ÐµÐ½Ñ‹"
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:11
-#: aleksis/apps/chronos/templates/chronos/timetable.html:24
-#: aleksis/apps/chronos/templates/chronos/timetable_print.html:11
-#: aleksis/apps/chronos/util/notifications.py:206
-msgid "Timetable"
-msgstr "Ð Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:29
-msgid "Group teachers:"
-msgstr "ÐŸÑ€ÐµÐ¿Ð¾Ð´Ð°Ð²Ð°Ñ‚ÐµÐ»Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿:"
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:55
-msgid "Show regular timetable"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¾Ð±Ñ‹Ñ‡Ð½Ð¾Ðµ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:63
-msgid "View class register of this week"
-msgstr "ÐžÐ±Ð·Ð¾Ñ€ ÐºÐ»Ð°ÑÑÐ½Ð¾Ð³Ð¾ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð° Ð·Ð° ÑÑ‚Ñƒ Ð½ÐµÐ´ÐµÐ»ÑŽ"
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:76
-msgid "Show SMART PLAN"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ SMART PLAN"
-
-#: aleksis/apps/chronos/templates/chronos/widget.html:8
-#, python-format
-msgid ""
-"\n"
-"        My timetable for %(day)s\n"
-"      "
-msgstr ""
-"\n"
-"        ÐœÐ¾Ñ‘ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð½Ð° %(day)s\n"
-"      "
-
-#: aleksis/apps/chronos/templates/chronos/widget.html:18
-msgid ""
-"\n"
-"          There is no timetable linked to your person.\n"
-"          "
+#: aleksis/apps/chronos/templates/chronos/supervision_event_description.txt:2
+msgid "Areas"
 msgstr ""
-"\n"
-"          Ðš Ð’Ð°ÑˆÐµÐ¹ Ð¿ÐµÑ€ÑÐ¾Ð½Ðµ Ð½Ðµ Ð¿Ñ€Ð¸Ð²ÑÐ·Ð°Ð½ Ð½Ð¸ Ð¾Ð´Ð¸Ð½ Ð¶ÑƒÑ€Ð½Ð°Ð».\n"
-"          "
-
-#: aleksis/apps/chronos/templates/chronos/widget.html:27
-msgid "Go to smart plan"
-msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº SMART PLAN"
 
-#: aleksis/apps/chronos/util/notifications.py:50
+#: aleksis/apps/chronos/util/notifications.py:48
 #, python-brace-format
-msgid ""
-"The {subject} lesson in the {period}. period on {day} has been cancelled."
+msgid "The {subject} lesson in the {period}. period on {day} has been cancelled."
 msgstr "Ð£Ñ€Ð¾Ðº {subject} Ð½Ð° {period} ÑƒÑ€Ð¾ÐºÐµ {day} Ð¾Ñ‚Ð¼ÐµÐ½Ñ‘Ð½."
 
-#: aleksis/apps/chronos/util/notifications.py:57
+#: aleksis/apps/chronos/util/notifications.py:55
 #, python-brace-format
-msgid ""
-"The {subject} lesson in the {period}. period on {day} has some current "
-"changes."
+msgid "The {subject} lesson in the {period}. period on {day} has some current changes."
 msgstr "Ð’ ÑƒÑ€Ð¾Ðº {subject} Ð½Ð° {period} ÑƒÑ€Ð¾ÐºÐµ {day} Ð²Ð½ÐµÑÐµÐ½Ñ‹ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ."
 
-#: aleksis/apps/chronos/util/notifications.py:66
+#: aleksis/apps/chronos/util/notifications.py:64
 #, python-brace-format
 msgid "The teacher {old} is substituted by {new}."
 msgid_plural "The teachers {old} are substituted by {new}."
@@ -685,97 +601,189 @@ msgstr[1] "ÐŸÑ€ÐµÐ¿Ð¾Ð´Ð°Ð²Ð°Ñ‚ÐµÐ»Ð¸ {old} Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ñ‹ Ð¿Ñ€ÐµÐ¿Ð¾Ð´Ð°Ð²Ð°
 msgstr[2] "ÐŸÑ€ÐµÐ¿Ð¾Ð´Ð°Ð²Ð°Ñ‚ÐµÐ»Ð¸ {old} Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ñ‹ Ð¿Ñ€ÐµÐ¿Ð¾Ð´Ð°Ð²Ð°Ñ‚ÐµÐ»ÑÐ¼Ð¸ {new}."
 msgstr[3] "ÐŸÑ€ÐµÐ¿Ð¾Ð´Ð°Ð²Ð°Ñ‚ÐµÐ»Ð¸ {old} Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ñ‹ Ð¿Ñ€ÐµÐ¿Ð¾Ð´Ð°Ð²Ð°Ñ‚ÐµÐ»ÑÐ¼Ð¸ {new}."
 
-#: aleksis/apps/chronos/util/notifications.py:78
+#: aleksis/apps/chronos/util/notifications.py:76
 #, python-brace-format
 msgid "The subject is changed to {subject}."
 msgstr "ÐŸÑ€ÐµÐ´Ð¼ÐµÑ‚ Ð·Ð°Ð¼ÐµÐ½Ñ‘Ð½ Ð½Ð° {subject}."
 
-#: aleksis/apps/chronos/util/notifications.py:84
+#: aleksis/apps/chronos/util/notifications.py:82
 #, python-brace-format
 msgid "The lesson is moved from {old} to {new}."
 msgstr "Ð£Ñ€Ð¾Ðº Ð¿ÐµÑ€ÐµÐ½ÐµÑÑ‘Ð½ Ñ {old} Ð½Ð° {new}."
 
-#: aleksis/apps/chronos/util/notifications.py:93
+#: aleksis/apps/chronos/util/notifications.py:91
 #, python-brace-format
 msgid "There is an additional comment: {comment}."
 msgstr "ÐŸÑ€Ð¸ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ ÐºÐ¾Ð¼Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ð¸Ð¹: {comment}."
 
-#: aleksis/apps/chronos/util/notifications.py:101
+#: aleksis/apps/chronos/util/notifications.py:99
 #, python-brace-format
-msgid ""
-"There is an event that starts on {date_start}, {period_from}. period and "
-"ends on {date_end}, {period_to}. period:"
-msgstr ""
-"Ð—Ð°Ð¿Ð»Ð°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾ Ð¼ÐµÑ€Ð¾Ð¿Ñ€Ð¸ÑÑ‚Ð¸Ðµ, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð½Ð°Ñ‡Ð¸Ð½Ð°ÐµÑ‚ÑÑ {date_start}, Ð½Ð° "
-"{period_from}. ÑƒÑ€Ð¾ÐºÐµ Ð¸ Ð·Ð°ÐºÐ°Ð½Ñ‡Ð¸Ð²Ð°ÐµÑ‚ÑÑ {date_end}, Ð½Ð° {period_to}. ÑƒÑ€Ð¾ÐºÐµ:"
+msgid "There is an event that starts on {date_start}, {period_from}. period and ends on {date_end}, {period_to}. period:"
+msgstr "Ð—Ð°Ð¿Ð»Ð°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾ Ð¼ÐµÑ€Ð¾Ð¿Ñ€Ð¸ÑÑ‚Ð¸Ðµ, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð½Ð°Ñ‡Ð¸Ð½Ð°ÐµÑ‚ÑÑ {date_start}, Ð½Ð° {period_from}. ÑƒÑ€Ð¾ÐºÐµ Ð¸ Ð·Ð°ÐºÐ°Ð½Ñ‡Ð¸Ð²Ð°ÐµÑ‚ÑÑ {date_end}, Ð½Ð° {period_to}. ÑƒÑ€Ð¾ÐºÐµ:"
 
-#: aleksis/apps/chronos/util/notifications.py:114
+#: aleksis/apps/chronos/util/notifications.py:112
 #, python-brace-format
-msgid ""
-"There is an event on {date} from the {period_from}. period to the "
-"{period_to}. period:"
-msgstr ""
-"Ð—Ð°Ð¿Ð»Ð°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾ Ð¼ÐµÑ€Ð¾Ð¿Ñ€Ð¸ÑÑ‚Ð¸Ðµ {date} Ñ {period_from}. ÑƒÑ€Ð¾ÐºÐ° Ð´Ð¾ {period_to}. "
-"ÑƒÑ€Ð¾ÐºÐ°:"
+msgid "There is an event on {date} from the {period_from}. period to the {period_to}. period:"
+msgstr "Ð—Ð°Ð¿Ð»Ð°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾ Ð¼ÐµÑ€Ð¾Ð¿Ñ€Ð¸ÑÑ‚Ð¸Ðµ {date} Ñ {period_from}. ÑƒÑ€Ð¾ÐºÐ° Ð´Ð¾ {period_to}. ÑƒÑ€Ð¾ÐºÐ°:"
 
-#: aleksis/apps/chronos/util/notifications.py:125
-#: aleksis/apps/chronos/util/notifications.py:145
+#: aleksis/apps/chronos/util/notifications.py:123
+#: aleksis/apps/chronos/util/notifications.py:143
 #, python-brace-format
 msgid "Groups: {groups}"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ñ‹: {groups}"
 
-#: aleksis/apps/chronos/util/notifications.py:127
-#: aleksis/apps/chronos/util/notifications.py:149
+#: aleksis/apps/chronos/util/notifications.py:125
+#: aleksis/apps/chronos/util/notifications.py:147
 #, python-brace-format
 msgid "Teachers: {teachers}"
 msgstr "ÐŸÑ€ÐµÐ¿Ð¾Ð´Ð°Ð²Ð°Ñ‚ÐµÐ»Ð¸: {teachers}"
 
-#: aleksis/apps/chronos/util/notifications.py:130
+#: aleksis/apps/chronos/util/notifications.py:128
 #, python-brace-format
 msgid "Rooms: {rooms}"
 msgstr "ÐšÐ¾Ð¼Ð½Ð°Ñ‚Ñ‹: {rooms}"
 
-#: aleksis/apps/chronos/util/notifications.py:137
+#: aleksis/apps/chronos/util/notifications.py:135
 #, python-brace-format
 msgid "There is an extra lesson on {date} in the {period}. period:"
 msgstr "Ð—Ð°Ð¿Ð»Ð°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ ÑƒÑ€Ð¾Ðº {date} Ð½Ð° {period}. ÑƒÑ€Ð¾ÐºÐµ:"
 
-#: aleksis/apps/chronos/util/notifications.py:147
+#: aleksis/apps/chronos/util/notifications.py:145
 #, python-brace-format
 msgid "Subject: {subject}"
 msgstr "ÐŸÑ€ÐµÐ´Ð¼ÐµÑ‚: {subject}"
 
-#: aleksis/apps/chronos/util/notifications.py:151
+#: aleksis/apps/chronos/util/notifications.py:149
 #, python-brace-format
 msgid "Room: {room}"
 msgstr "ÐšÐ¾Ð¼Ð½Ð°Ñ‚Ð°: {room}"
 
-#: aleksis/apps/chronos/util/notifications.py:153
+#: aleksis/apps/chronos/util/notifications.py:151
 #, python-brace-format
 msgid "Comment: {comment}."
 msgstr "ÐšÐ¾Ð¼Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ð¸Ð¹: {comment}."
 
-#: aleksis/apps/chronos/util/notifications.py:156
+#: aleksis/apps/chronos/util/notifications.py:154
 #, python-brace-format
-msgid ""
-"The supervision of {old} on {date} between the {period_from}. period and the "
-"{period_to}. period in the area {area} is substituted by {new}."
-msgstr ""
-"ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒ {old}, {date} Ð¼ÐµÐ¶Ð´Ñƒ {period_from}. Ð¸ {period_to}. ÑƒÑ€Ð¾ÐºÐ°Ð¼Ð¸ Ð² Ð·Ð¾Ð½Ðµ "
-"{area} Ð·Ð°Ð¼ÐµÐ½Ñ‘Ð½ Ð½Ð° {new}."
+msgid "The supervision of {old} on {date} between the {period_from}. period and the {period_to}. period in the area {area} is substituted by {new}."
+msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒ {old}, {date} Ð¼ÐµÐ¶Ð´Ñƒ {period_from}. Ð¸ {period_to}. ÑƒÑ€Ð¾ÐºÐ°Ð¼Ð¸ Ð² Ð·Ð¾Ð½Ðµ {area} Ð·Ð°Ð¼ÐµÐ½Ñ‘Ð½ Ð½Ð° {new}."
 
-#: aleksis/apps/chronos/util/notifications.py:207
+#: aleksis/apps/chronos/util/notifications.py:204
+msgid "Timetable"
+msgstr "Ð Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
+
+#: aleksis/apps/chronos/util/notifications.py:205
 msgid "There are current changes to your timetable."
 msgstr "Ð£ Ð’Ð°Ñ Ð² Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ð¸ Ð¿Ñ€Ð¾Ð¸Ð·Ð¾ÑˆÐ»Ð¸ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ."
 
-#: aleksis/apps/chronos/views.py:270
-msgid "The substitution has been saved."
-msgstr "Ð—Ð°Ð¼ÐµÐ½Ð° ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð°."
+#~ msgid "Options for timetables"
+#~ msgstr "ÐžÐ¿Ñ†Ð¸Ð¸ Ð´Ð»Ñ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ"
+
+#~ msgid "Optional data for timetables"
+#~ msgstr "ÐžÐ¿Ñ†Ð¸Ð¾Ð½Ð°Ð»ÑŒÐ½Ñ‹Ðµ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð´Ð»Ñ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ"
+
+#~ msgid "My timetable"
+#~ msgstr "ÐœÐ¾Ñ‘ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
+
+#~ msgid "All timetables"
+#~ msgstr "Ð’ÑÐµ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ"
+
+#~ msgid "Daily lessons"
+#~ msgstr "Ð•Ð¶ÐµÐ´Ð½ÐµÐ²Ð½Ñ‹Ðµ ÑƒÑ€Ð¾ÐºÐ¸"
+
+#~ msgid "Show announcement in timetable views?"
+#~ msgstr "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð¾Ð±ÑŠÑÐ²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ñ€Ð¸ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ðµ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ?"
+
+#~ msgid "Can view room timetable"
+#~ msgstr "ÐœÐ¾Ð¶ÐµÑ‚ Ð¿Ñ€Ð¾ÑÐ¼Ð°Ñ‚Ð¸Ð²Ð°Ñ‚ÑŒ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ ÐºÐ¾Ð¼Ð½Ð°Ñ‚Ñ‹"
+
+#~ msgid "Timetable widget"
+#~ msgstr "Ð’Ð¸Ð´Ð¶ÐµÑ‚ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ"
 
-#: aleksis/apps/chronos/views.py:291
-msgid "The substitution has been deleted."
-msgstr "Ð—Ð°Ð¼ÐµÐ½Ð° ÑƒÐ´Ð°Ð»ÐµÐ½Ð°."
+#~ msgid "Timetable widgets"
+#~ msgstr "Ð’Ð¸Ð´Ð¶ÐµÑ‚Ñ‹ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ"
 
-#: aleksis/apps/chronos/templates/chronos/timetable.html:84
-msgid "View class register of the current week"
-msgstr "ÐžÐ±Ð·Ð¾Ñ€ ÐºÐ»Ð°ÑÑÐ½Ð¾Ð³Ð¾ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð° Ð·Ð° Ñ‚ÐµÐºÑƒÑ‰ÑƒÑŽ Ð½ÐµÐ´ÐµÐ»ÑŽ"
+#~ msgid "Substitution"
+#~ msgstr "Ð—Ð°Ð¼ÐµÐ½Ð°"
+
+#~ msgid "Manage substitution"
+#~ msgstr "Ð£Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð·Ð°Ð¼ÐµÐ½Ð°Ð¼Ð¸"
+
+#~ msgid "No teachers timetables available."
+#~ msgstr "Ð Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ Ð¿Ñ€ÐµÐ¿Ð¾Ð´Ð°Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹."
+
+#~ msgid "No group timetables available."
+#~ msgstr "Ð Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ Ð³Ñ€ÑƒÐ¿Ð¿ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹."
+
+#~ msgid "No room timetables available."
+#~ msgstr "Ð Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð½Ð°Ñ‚ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹."
+
+#~ msgid "Edit substitution."
+#~ msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð°Ð¼ÐµÐ½Ñƒ."
+
+#~ msgid "Edit substitution"
+#~ msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð°Ð¼ÐµÐ½Ñƒ"
+
+#~ msgid "Delete"
+#~ msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
+
+#~ msgid "SMART PLAN"
+#~ msgstr "SMART PLAN"
+
+#~ msgid "Show week timetable for"
+#~ msgstr "ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð·Ð¸Ñ‚ÑŒ Ð½ÐµÐ´ÐµÐ»ÑŒÐ½Ð¾Ðµ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð´Ð»Ñ"
+
+#~ msgid "Cancelled due to an event"
+#~ msgstr "ÐžÑ‚Ð¼ÐµÐ½ÐµÐ½Ð¾ Ð¸Ð·-Ð·Ð° ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ"
+
+#~ msgid "Cancelled for teachers"
+#~ msgstr "ÐžÑ‚Ð¼ÐµÐ½ÐµÐ½Ð¾ Ð´Ð»Ñ Ð¿Ñ€ÐµÐ¿Ð¾Ð´Ð°Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹"
+
+#~ msgid "Today"
+#~ msgstr "Ð¡ÐµÐ³Ð¾Ð´Ð½Ñ"
+
+#~ msgid "CW"
+#~ msgstr "ÐÐ”"
+
+#~ msgid "Group teachers:"
+#~ msgstr "ÐŸÑ€ÐµÐ¿Ð¾Ð´Ð°Ð²Ð°Ñ‚ÐµÐ»Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿:"
+
+#~ msgid "Show regular timetable"
+#~ msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¾Ð±Ñ‹Ñ‡Ð½Ð¾Ðµ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
+
+#~ msgid "View class register of this week"
+#~ msgstr "ÐžÐ±Ð·Ð¾Ñ€ ÐºÐ»Ð°ÑÑÐ½Ð¾Ð³Ð¾ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð° Ð·Ð° ÑÑ‚Ñƒ Ð½ÐµÐ´ÐµÐ»ÑŽ"
+
+#~ msgid "Show SMART PLAN"
+#~ msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ SMART PLAN"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "        My timetable for %(day)s\n"
+#~ "      "
+#~ msgstr ""
+#~ "\n"
+#~ "        ÐœÐ¾Ñ‘ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð½Ð° %(day)s\n"
+#~ "      "
+
+#~ msgid ""
+#~ "\n"
+#~ "          There is no timetable linked to your person.\n"
+#~ "          "
+#~ msgstr ""
+#~ "\n"
+#~ "          Ðš Ð’Ð°ÑˆÐµÐ¹ Ð¿ÐµÑ€ÑÐ¾Ð½Ðµ Ð½Ðµ Ð¿Ñ€Ð¸Ð²ÑÐ·Ð°Ð½ Ð½Ð¸ Ð¾Ð´Ð¸Ð½ Ð¶ÑƒÑ€Ð½Ð°Ð».\n"
+#~ "          "
+
+#~ msgid "Go to smart plan"
+#~ msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº SMART PLAN"
+
+#~ msgid "The substitution has been saved."
+#~ msgstr "Ð—Ð°Ð¼ÐµÐ½Ð° ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð°."
+
+#~ msgid "The substitution has been deleted."
+#~ msgstr "Ð—Ð°Ð¼ÐµÐ½Ð° ÑƒÐ´Ð°Ð»ÐµÐ½Ð°."
+
+#~ msgid "View class register of the current week"
+#~ msgstr "ÐžÐ±Ð·Ð¾Ñ€ ÐºÐ»Ð°ÑÑÐ½Ð¾Ð³Ð¾ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð° Ð·Ð° Ñ‚ÐµÐºÑƒÑ‰ÑƒÑŽ Ð½ÐµÐ´ÐµÐ»ÑŽ"
diff --git a/aleksis/apps/chronos/locale/tr_TR/LC_MESSAGES/django.po b/aleksis/apps/chronos/locale/tr_TR/LC_MESSAGES/django.po
index f4190ee2c3668ce8a8a236aa9dbb007292e467a9..cfc760f01b3206aaf7123340eccf529e9e4db354 100644
--- a/aleksis/apps/chronos/locale/tr_TR/LC_MESSAGES/django.po
+++ b/aleksis/apps/chronos/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: 2022-06-21 11:32+0200\n"
+"POT-Creation-Date: 2024-08-18 14:23+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,76 +17,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: aleksis/apps/chronos/form_extensions.py:7
-msgid "Options for timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/form_extensions.py:8
-msgid "Optional data for timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:6 aleksis/apps/chronos/preferences.py:10
-msgid "Timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:16
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:11
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:18
-msgid "My timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:27
-#: aleksis/apps/chronos/templates/chronos/all.html:11
-#: aleksis/apps/chronos/templates/chronos/all.html:12
-msgid "All timetables"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:38
-msgid "Daily lessons"
-msgstr ""
-
-#: aleksis/apps/chronos/menus.py:49
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:11
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:17
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:12
-msgid "Substitutions"
-msgstr ""
-
 #: aleksis/apps/chronos/mixins.py:25
 msgid "Linked validity range"
 msgstr ""
 
-#: aleksis/apps/chronos/model_extensions.py:142
-msgid "Show announcement in timetable views?"
-msgstr ""
-
-#: aleksis/apps/chronos/model_extensions.py:151
+#: aleksis/apps/chronos/model_extensions.py:145
 msgid "Can view group timetable"
 msgstr ""
 
-#: aleksis/apps/chronos/model_extensions.py:155
+#: aleksis/apps/chronos/model_extensions.py:149
 msgid "Can view person timetable"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:86
+#: aleksis/apps/chronos/models.py:87
 msgid "School term"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:89 aleksis/apps/chronos/models.py:699
+#: aleksis/apps/chronos/models.py:90 aleksis/apps/chronos/models.py:626
+#: aleksis/apps/chronos/models.py:1310
 msgid "Name"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:91 aleksis/apps/chronos/models.py:754
-#: aleksis/apps/chronos/models.py:827 aleksis/apps/chronos/models.py:1061
+#: aleksis/apps/chronos/models.py:92 aleksis/apps/chronos/models.py:676
+#: aleksis/apps/chronos/models.py:747 aleksis/apps/chronos/models.py:979
 msgid "Start date"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:92 aleksis/apps/chronos/models.py:755
-#: aleksis/apps/chronos/models.py:828 aleksis/apps/chronos/models.py:1062
+#: aleksis/apps/chronos/models.py:93 aleksis/apps/chronos/models.py:677
+#: aleksis/apps/chronos/models.py:748 aleksis/apps/chronos/models.py:980
 msgid "End date"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:111
+#: aleksis/apps/chronos/models.py:112
 msgid "The start date must be earlier than the end date."
 msgstr ""
 
@@ -106,628 +68,583 @@ msgstr ""
 msgid "Validity ranges"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:150
+#: aleksis/apps/chronos/models.py:149
 msgid "Week day"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:152
+#: aleksis/apps/chronos/models.py:151
 msgid "Number of period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:154
+#: aleksis/apps/chronos/models.py:153
 msgid "Start time"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:155
+#: aleksis/apps/chronos/models.py:154
 msgid "End time"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:338 aleksis/apps/chronos/models.py:525
-#: aleksis/apps/chronos/models.py:1191
+#: aleksis/apps/chronos/models.py:324 aleksis/apps/chronos/models.py:496
+#: aleksis/apps/chronos/models.py:1122
 msgid "Time period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:339
+#: aleksis/apps/chronos/models.py:325
 msgid "Time periods"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:343 aleksis/apps/chronos/models.py:364
-#: aleksis/apps/chronos/models.py:698 aleksis/apps/chronos/models.py:873
-#: aleksis/apps/chronos/models.py:895
+#: aleksis/apps/chronos/models.py:329 aleksis/apps/chronos/models.py:625
+#: aleksis/apps/chronos/models.py:793 aleksis/apps/chronos/models.py:810
 msgid "Short name"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:344 aleksis/apps/chronos/models.py:365
-#: aleksis/apps/chronos/models.py:874 aleksis/apps/chronos/models.py:896
+#: aleksis/apps/chronos/models.py:330 aleksis/apps/chronos/models.py:794
+#: aleksis/apps/chronos/models.py:811
 msgid "Long name"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:346
+#: aleksis/apps/chronos/models.py:332
 msgid "Foreground colour"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:347
+#: aleksis/apps/chronos/models.py:333
 msgid "Background colour"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:354 aleksis/apps/chronos/models.py:390
-#: aleksis/apps/chronos/models.py:446 aleksis/apps/chronos/models.py:1198
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
+#: aleksis/apps/chronos/models.py:340 aleksis/apps/chronos/models.py:349
+#: aleksis/apps/chronos/models.py:416 aleksis/apps/chronos/models.py:1129
+#: aleksis/apps/chronos/models.py:1345
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:2
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:29
 msgid "Subject"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:355
+#: aleksis/apps/chronos/models.py:341
 msgid "Subjects"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:374
-msgid "Can view room timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:376 aleksis/apps/chronos/models.py:454
-#: aleksis/apps/chronos/models.py:533 aleksis/apps/chronos/models.py:751
-#: aleksis/apps/chronos/models.py:1213
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
-msgid "Room"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:377 aleksis/apps/chronos/models.py:1078
-#: aleksis/apps/chronos/templates/chronos/all.html:45
-msgid "Rooms"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:393 aleksis/apps/chronos/models.py:452
-#: aleksis/apps/chronos/models.py:1080 aleksis/apps/chronos/models.py:1206
-#: aleksis/apps/chronos/tables.py:35
-#: aleksis/apps/chronos/templates/chronos/all.html:17
+#: aleksis/apps/chronos/models.py:352 aleksis/apps/chronos/models.py:422
+#: aleksis/apps/chronos/models.py:998 aleksis/apps/chronos/models.py:1137
+#: aleksis/apps/chronos/models.py:1338
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:3
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:28
+#: aleksis/apps/chronos/templates/chronos/supervision_event_description.txt:1
 msgid "Teachers"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:399
+#: aleksis/apps/chronos/models.py:358
 msgid "Periods"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:401 aleksis/apps/chronos/models.py:1077
-#: aleksis/apps/chronos/models.py:1201 aleksis/apps/chronos/tables.py:34
-#: aleksis/apps/chronos/templates/chronos/all.html:31
+#: aleksis/apps/chronos/models.py:360 aleksis/apps/chronos/models.py:995
+#: aleksis/apps/chronos/models.py:1132 aleksis/apps/chronos/models.py:1326
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:1
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:26
 msgid "Groups"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:424 aleksis/apps/chronos/models.py:519
-#: aleksis/apps/chronos/models.py:795
+#: aleksis/apps/chronos/models.py:394 aleksis/apps/chronos/models.py:490
+#: aleksis/apps/chronos/models.py:716 aleksis/apps/chronos/models.py:1430
+#: aleksis/apps/chronos/models.py:1454
 msgid "Lesson"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:425
-#: aleksis/apps/chronos/templates/chronos/lessons_day.html:9
-#: aleksis/apps/chronos/templates/chronos/lessons_day.html:19
+#: aleksis/apps/chronos/models.py:395 aleksis/apps/chronos/models.py:1306
 msgid "Lessons"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:433 aleksis/apps/chronos/models.py:1185
+#: aleksis/apps/chronos/models.py:403 aleksis/apps/chronos/models.py:1116
 msgid "Week"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:434 aleksis/apps/chronos/models.py:1186
+#: aleksis/apps/chronos/models.py:404 aleksis/apps/chronos/models.py:1117
 msgid "Year"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:437 aleksis/apps/chronos/models.py:654
+#: aleksis/apps/chronos/models.py:407 aleksis/apps/chronos/models.py:620
 msgid "Lesson period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:456
+#: aleksis/apps/chronos/models.py:425 aleksis/apps/chronos/models.py:504
+#: aleksis/apps/chronos/models.py:673 aleksis/apps/chronos/models.py:1144
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
+msgid "Room"
+msgstr ""
+
+#: aleksis/apps/chronos/models.py:428
 msgid "Cancelled?"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:458
+#: aleksis/apps/chronos/models.py:430
 msgid "Cancelled for teachers?"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:461 aleksis/apps/chronos/models.py:770
-#: aleksis/apps/chronos/models.py:813 aleksis/apps/chronos/models.py:1216
+#: aleksis/apps/chronos/models.py:433 aleksis/apps/chronos/models.py:692
+#: aleksis/apps/chronos/models.py:734 aleksis/apps/chronos/models.py:1147
+#: aleksis/apps/chronos/models.py:1357
 msgid "Comment"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:465
+#: aleksis/apps/chronos/models.py:437
 msgid "Lessons can only be either substituted or cancelled."
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:506
+#: aleksis/apps/chronos/models.py:477
 msgid "Lesson substitution"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:507
+#: aleksis/apps/chronos/models.py:478
 msgid "Lesson substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:655
+#: aleksis/apps/chronos/models.py:621
 msgid "Lesson periods"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:693
-msgid "Timetable widget"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:694
-msgid "Timetable widgets"
-msgstr ""
-
-#: aleksis/apps/chronos/models.py:708 aleksis/apps/chronos/models.py:726
+#: aleksis/apps/chronos/models.py:635 aleksis/apps/chronos/models.py:648
 msgid "Absence reason"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:709
+#: aleksis/apps/chronos/models.py:636
 msgid "Absence reasons"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:735 aleksis/apps/chronos/models.py:974
-#: aleksis/apps/chronos/models.py:1025
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
+#: aleksis/apps/chronos/models.py:657 aleksis/apps/chronos/models.py:889
+#: aleksis/apps/chronos/models.py:943
 msgid "Teacher"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:743
+#: aleksis/apps/chronos/models.py:665
 msgid "Group"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:759 aleksis/apps/chronos/models.py:802
+#: aleksis/apps/chronos/models.py:681 aleksis/apps/chronos/models.py:723
 msgid "Start period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:766 aleksis/apps/chronos/models.py:808
+#: aleksis/apps/chronos/models.py:688 aleksis/apps/chronos/models.py:729
 msgid "End period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:780
+#: aleksis/apps/chronos/models.py:702
 msgid "Unknown absence"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:786
+#: aleksis/apps/chronos/models.py:707
 msgid "Absence"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:787
+#: aleksis/apps/chronos/models.py:708
 msgid "Absences"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:798
+#: aleksis/apps/chronos/models.py:719
 msgid "Date of exam"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:812 aleksis/apps/chronos/models.py:826
-#: aleksis/apps/chronos/models.py:1059
+#: aleksis/apps/chronos/models.py:733 aleksis/apps/chronos/models.py:746
+#: aleksis/apps/chronos/models.py:977
 msgid "Title"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:819
+#: aleksis/apps/chronos/models.py:739
 msgid "Exam"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:820
+#: aleksis/apps/chronos/models.py:740
 msgid "Exams"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:829
+#: aleksis/apps/chronos/models.py:749
 msgid "Comments"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:868
+#: aleksis/apps/chronos/models.py:788
 msgid "Holiday"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:869
+#: aleksis/apps/chronos/models.py:789
 msgid "Holidays"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:883 aleksis/apps/chronos/models.py:964
+#: aleksis/apps/chronos/models.py:803 aleksis/apps/chronos/models.py:879
 msgid "Supervision area"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:884
+#: aleksis/apps/chronos/models.py:804
 msgid "Supervision areas"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:901
+#: aleksis/apps/chronos/models.py:816
 msgid "Time period after break starts"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:909
+#: aleksis/apps/chronos/models.py:824
 msgid "Time period before break ends"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:949 aleksis/apps/chronos/models.py:968
+#: aleksis/apps/chronos/models.py:864 aleksis/apps/chronos/models.py:883
 msgid "Break"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:950
+#: aleksis/apps/chronos/models.py:865
 msgid "Breaks"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1005 aleksis/apps/chronos/models.py:1018
-#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:23
-#: aleksis/apps/chronos/templates/chronos/partials/supervision.html:15
+#: aleksis/apps/chronos/models.py:923 aleksis/apps/chronos/models.py:936
+#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:3
 msgid "Supervision"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1006
+#: aleksis/apps/chronos/models.py:924 aleksis/apps/chronos/models.py:1622
 msgid "Supervisions"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1014
+#: aleksis/apps/chronos/models.py:932
 msgid "Date"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1048
+#: aleksis/apps/chronos/models.py:966
 msgid "Supervision substitution"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1049
+#: aleksis/apps/chronos/models.py:967
 msgid "Supervision substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1067
+#: aleksis/apps/chronos/models.py:985
 msgid "Start time period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1073
+#: aleksis/apps/chronos/models.py:991
 msgid "End time period"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1087
+#: aleksis/apps/chronos/models.py:996 aleksis/apps/chronos/models.py:1332
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:4
+msgid "Rooms"
+msgstr ""
+
+#: aleksis/apps/chronos/models.py:1005
 #, python-brace-format
 msgid "Event {pk}"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1172
-#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:27
+#: aleksis/apps/chronos/models.py:1103
 msgid "Event"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1173
+#: aleksis/apps/chronos/models.py:1104
 msgid "Events"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1221
+#: aleksis/apps/chronos/models.py:1152
 msgid "Related exam"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1251
+#: aleksis/apps/chronos/models.py:1181
 msgid "Extra lesson"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1252
+#: aleksis/apps/chronos/models.py:1182
 msgid "Extra lessons"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1264
+#: aleksis/apps/chronos/models.py:1194
 msgid "Number of days shown in the plan"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1268
+#: aleksis/apps/chronos/models.py:1198
 msgid "Show header box"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1269 aleksis/apps/chronos/preferences.py:61
+#: aleksis/apps/chronos/models.py:1199 aleksis/apps/chronos/preferences.py:100
 msgid "The header box shows affected teachers/groups."
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1276
+#: aleksis/apps/chronos/models.py:1206
 msgid "Revision which triggered the last update"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1337
+#: aleksis/apps/chronos/models.py:1278
 msgid "Automatic plan"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1338
+#: aleksis/apps/chronos/models.py:1279
 msgid "Automatic plans"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1352
+#: aleksis/apps/chronos/models.py:1293
 msgid "Can view all room timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1353
+#: aleksis/apps/chronos/models.py:1294
 msgid "Can view all group timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1354
+#: aleksis/apps/chronos/models.py:1295
 msgid "Can view all person timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1355
+#: aleksis/apps/chronos/models.py:1296
 msgid "Can view timetable overview"
 msgstr ""
 
-#: aleksis/apps/chronos/models.py:1356
+#: aleksis/apps/chronos/models.py:1297
 msgid "Can view all lessons per day"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:18
-msgid "Use parent groups in timetable views"
+#: aleksis/apps/chronos/models.py:1298
+msgid "Can view all supervisions per day"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:20
-msgid "If an lesson or substitution has only one group and this group has parent groups, show the parent groups instead of the original group."
+#: aleksis/apps/chronos/models.py:1313
+msgid "Start slot number"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:31
-msgid "Shorten groups in timetable views"
+#: aleksis/apps/chronos/models.py:1316
+msgid "End slot number"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:32
-msgid "If there are more groups than the set limit, they will be collapsed."
+#: aleksis/apps/chronos/models.py:1320
+msgid "Course"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:40
-msgid "Limit of groups for shortening of groups"
+#: aleksis/apps/chronos/models.py:1353
+#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:4
+msgid "Cancelled"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:42
-msgid "If an user activates shortening of groups,they will be collapsed if there are more groups than this limit."
+#: aleksis/apps/chronos/models.py:1401 aleksis/apps/chronos/models.py:1413
+#: aleksis/apps/chronos/models.py:1425
+msgid "{} (instead of {})"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:52
-msgid "Number of days shown on substitutions print view"
+#: aleksis/apps/chronos/models.py:1614
+msgid "Lesson Event"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:60
-msgid "Show header box in substitution views"
+#: aleksis/apps/chronos/models.py:1615
+msgid "Lesson Events"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:70
-msgid "Show parent groups in header box in substitution views instead of original groups"
+#: aleksis/apps/chronos/models.py:1630
+msgid "Supervision: {}"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:79
-msgid "How many days in advance users should be notified about timetable changes?"
+#: aleksis/apps/chronos/preferences.py:21
+msgid "Timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:87
-msgid "Time for sending notifications about timetable changes"
+#: aleksis/apps/chronos/preferences.py:29
+msgid "Use parent groups in timetable views"
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:90
-msgid "This is only used for scheduling notifications which doesn't affect the time period configured above. All other notifications affecting the next days are sent immediately."
+#: aleksis/apps/chronos/preferences.py:31
+msgid "If a lesson or substitution has only one group and this group has parent groups, show the parent groups instead of the original group."
 msgstr ""
 
-#: aleksis/apps/chronos/preferences.py:101
-#: aleksis/apps/chronos/preferences.py:109
-msgid "Send notifications for current timetable changes"
+#: aleksis/apps/chronos/preferences.py:42
+msgid "Shorten groups in timetable views"
 msgstr ""
 
-#: aleksis/apps/chronos/tables.py:41
-msgid "Substitution"
+#: aleksis/apps/chronos/preferences.py:43
+msgid "If there are more groups than the set limit, they will be collapsed."
 msgstr ""
 
-#: aleksis/apps/chronos/tables.py:43
-msgid "Manage substitution"
+#: aleksis/apps/chronos/preferences.py:51
+msgid "Limit of groups for shortening of groups"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/all.html:25
-msgid "No teachers timetables available."
+#: aleksis/apps/chronos/preferences.py:53
+msgid "If a user activates shortening of groups,they will be collapsed if there are more groups than this limit."
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/all.html:39
-msgid "No group timetables available."
+#: aleksis/apps/chronos/preferences.py:65
+msgid "Relevant days for substitution plans"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/all.html:53
-msgid "No room timetables available."
+#: aleksis/apps/chronos/preferences.py:82
+msgid "Time when substitution plans switch to the next day"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:11
-msgid "Edit substitution."
+#: aleksis/apps/chronos/preferences.py:91
+msgid "Number of days shown on substitutions print view"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:12
-msgid "Edit substitution"
+#: aleksis/apps/chronos/preferences.py:99
+msgid "Show header box in substitution views"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:25
-msgid "Delete"
+#: aleksis/apps/chronos/preferences.py:109
+msgid "Show parent groups in header box in substitution views instead of original groups"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:19
-#: aleksis/apps/chronos/templates/chronos/timetable.html:50
-msgid "SMART PLAN"
+#: aleksis/apps/chronos/preferences.py:118
+msgid "How many days in advance users should be notified about timetable changes?"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:22
-msgid "Show week timetable for"
+#: aleksis/apps/chronos/preferences.py:126
+msgid "Time for sending notifications about timetable changes"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:10
-msgid "Absent teachers"
+#: aleksis/apps/chronos/preferences.py:129
+msgid "This is only used for scheduling notifications which doesn't affect the time period configured above. All other notifications affecting the next days are sent immediately."
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:22
-msgid "Absent groups"
+#: aleksis/apps/chronos/preferences.py:140
+#: aleksis/apps/chronos/preferences.py:148
+msgid "Send notifications for current timetable changes"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:34
-msgid "Affected teachers"
+#: aleksis/apps/chronos/preferences.py:158
+msgid "Group types to show in timetables"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:46
-msgid "Affected groups"
+#: aleksis/apps/chronos/preferences.py:159
+msgid "If you leave it empty, all groups will be shown."
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/lesson.html:27
-msgid "Cancelled due to an event"
+#: aleksis/apps/chronos/preferences.py:169
+msgid "Lesson calendar feed color"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:4
-msgid "Cancelled"
+#: aleksis/apps/chronos/preferences.py:181
+msgid "Supervision calendar feed color"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:6
-msgid "Cancelled for teachers"
+#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:10
+msgid "Absent teachers"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/today.html:2
-msgid "Today"
+#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:22
+msgid "Absent groups"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:14
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:25
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:36
-msgid "CW"
+#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:34
+msgid "Affected teachers"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:49
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:31
-msgid "Notes"
+#: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:46
+msgid "Affected groups"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:57
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:41
-msgid "No substitutions available."
+#: aleksis/apps/chronos/templates/chronos/partials/subs/period.html:12
+msgid "all day"
 msgstr ""
 
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:11
 msgid "Print: Substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/timetable.html:11
-#: aleksis/apps/chronos/templates/chronos/timetable.html:24
-#: aleksis/apps/chronos/templates/chronos/timetable_print.html:11
-#: aleksis/apps/chronos/util/notifications.py:206
-msgid "Timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:29
-msgid "Group teachers:"
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:55
-msgid "Show regular timetable"
-msgstr ""
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:63
-#: aleksis/apps/chronos/templates/chronos/timetable.html:84
-msgid "View class register of this week"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:12
+msgid "Substitutions"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/timetable.html:76
-msgid "Show SMART PLAN"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:27
+msgid "Time"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/widget.html:8
-#, python-format
-msgid ""
-"\n"
-"        My timetable for %(day)s\n"
-"      "
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:31
+msgid "Notes"
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/widget.html:18
-msgid ""
-"\n"
-"          There is no timetable linked to your person.\n"
-"          "
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:41
+msgid "No substitutions available."
 msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/widget.html:27
-msgid "Go to smart plan"
+#: aleksis/apps/chronos/templates/chronos/supervision_event_description.txt:2
+msgid "Areas"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:50
+#: aleksis/apps/chronos/util/notifications.py:48
 #, python-brace-format
 msgid "The {subject} lesson in the {period}. period on {day} has been cancelled."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:57
+#: aleksis/apps/chronos/util/notifications.py:55
 #, python-brace-format
 msgid "The {subject} lesson in the {period}. period on {day} has some current changes."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:66
+#: aleksis/apps/chronos/util/notifications.py:64
 #, python-brace-format
 msgid "The teacher {old} is substituted by {new}."
 msgid_plural "The teachers {old} are substituted by {new}."
 msgstr[0] ""
 msgstr[1] ""
 
-#: aleksis/apps/chronos/util/notifications.py:78
+#: aleksis/apps/chronos/util/notifications.py:76
 #, python-brace-format
 msgid "The subject is changed to {subject}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:84
+#: aleksis/apps/chronos/util/notifications.py:82
 #, python-brace-format
 msgid "The lesson is moved from {old} to {new}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:93
+#: aleksis/apps/chronos/util/notifications.py:91
 #, python-brace-format
 msgid "There is an additional comment: {comment}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:101
+#: aleksis/apps/chronos/util/notifications.py:99
 #, python-brace-format
 msgid "There is an event that starts on {date_start}, {period_from}. period and ends on {date_end}, {period_to}. period:"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:114
+#: aleksis/apps/chronos/util/notifications.py:112
 #, python-brace-format
 msgid "There is an event on {date} from the {period_from}. period to the {period_to}. period:"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:125
-#: aleksis/apps/chronos/util/notifications.py:145
+#: aleksis/apps/chronos/util/notifications.py:123
+#: aleksis/apps/chronos/util/notifications.py:143
 #, python-brace-format
 msgid "Groups: {groups}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:127
-#: aleksis/apps/chronos/util/notifications.py:149
+#: aleksis/apps/chronos/util/notifications.py:125
+#: aleksis/apps/chronos/util/notifications.py:147
 #, python-brace-format
 msgid "Teachers: {teachers}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:130
+#: aleksis/apps/chronos/util/notifications.py:128
 #, python-brace-format
 msgid "Rooms: {rooms}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:137
+#: aleksis/apps/chronos/util/notifications.py:135
 #, python-brace-format
 msgid "There is an extra lesson on {date} in the {period}. period:"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:147
+#: aleksis/apps/chronos/util/notifications.py:145
 #, python-brace-format
 msgid "Subject: {subject}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:151
+#: aleksis/apps/chronos/util/notifications.py:149
 #, python-brace-format
 msgid "Room: {room}"
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:153
+#: aleksis/apps/chronos/util/notifications.py:151
 #, python-brace-format
 msgid "Comment: {comment}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:156
+#: aleksis/apps/chronos/util/notifications.py:154
 #, python-brace-format
 msgid "The supervision of {old} on {date} between the {period_from}. period and the {period_to}. period in the area {area} is substituted by {new}."
 msgstr ""
 
-#: aleksis/apps/chronos/util/notifications.py:207
-msgid "There are current changes to your timetable."
-msgstr ""
-
-#: aleksis/apps/chronos/views.py:270
-msgid "The substitution has been saved."
+#: aleksis/apps/chronos/util/notifications.py:204
+msgid "Timetable"
 msgstr ""
 
-#: aleksis/apps/chronos/views.py:291
-msgid "The substitution has been deleted."
+#: aleksis/apps/chronos/util/notifications.py:205
+msgid "There are current changes to your timetable."
 msgstr ""
diff --git a/aleksis/apps/chronos/locale/uk/LC_MESSAGES/django.po b/aleksis/apps/chronos/locale/uk/LC_MESSAGES/django.po
index 2985cd57672e71f444acfa40489d632919c92141..2a59feb53f2476f5088389967bf5de5ad9dbdd99 100644
--- a/aleksis/apps/chronos/locale/uk/LC_MESSAGES/django.po
+++ b/aleksis/apps/chronos/locale/uk/LC_MESSAGES/django.po
@@ -7,93 +7,49 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-06-21 11:32+0200\n"
+"POT-Creation-Date: 2024-08-18 14:23+0200\n"
 "PO-Revision-Date: 2022-06-22 19:59+0000\n"
 "Last-Translator: Serhii Horichenko <m@sgg.im>\n"
-"Language-Team: Ukrainian <https://translate.edugit.org/projects/aleksis/"
-"aleksis-app-chronos/uk/>\n"
+"Language-Team: Ukrainian <https://translate.edugit.org/projects/aleksis/aleksis-app-chronos/uk/>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 "
-"? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > "
-"14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % "
-"100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 "X-Generator: Weblate 4.12.1\n"
 
-#: aleksis/apps/chronos/form_extensions.py:7
-msgid "Options for timetables"
-msgstr "ÐžÐ¿Ñ†Ñ–Ñ— Ð´Ð»Ñ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ñ–Ð²"
-
-#: aleksis/apps/chronos/form_extensions.py:8
-msgid "Optional data for timetables"
-msgstr "Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ñ– Ð´Ð°Ð½Ñ– Ð´Ð»Ñ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ñ–Ð²"
-
-#: aleksis/apps/chronos/menus.py:6 aleksis/apps/chronos/preferences.py:10
-msgid "Timetables"
-msgstr "Ð Ð¾Ð·ÐºÐ»Ð°Ð´Ð¸"
-
-#: aleksis/apps/chronos/menus.py:16
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:11
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:18
-msgid "My timetable"
-msgstr "ÐœÑ–Ð¹ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´"
-
-#: aleksis/apps/chronos/menus.py:27
-#: aleksis/apps/chronos/templates/chronos/all.html:11
-#: aleksis/apps/chronos/templates/chronos/all.html:12
-msgid "All timetables"
-msgstr "Ð£ÑÑ– Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ð¸"
-
-#: aleksis/apps/chronos/menus.py:38
-msgid "Daily lessons"
-msgstr "Ð©Ð¾Ð´ÐµÐ½Ð½Ñ– ÑƒÑ€Ð¾ÐºÐ¸"
-
-#: aleksis/apps/chronos/menus.py:49
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:11
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:17
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:12
-msgid "Substitutions"
-msgstr "Ð—Ð°Ð¼Ñ–Ð½Ð¸"
-
 #: aleksis/apps/chronos/mixins.py:25
 msgid "Linked validity range"
 msgstr "ÐŸÐ¾Ð²'ÑÐ·Ð°Ð½Ð¸Ð¹ Ð´Ñ–Ð°Ð¿Ð°Ð·Ð¾Ð½"
 
-#: aleksis/apps/chronos/model_extensions.py:142
-msgid "Show announcement in timetable views?"
-msgstr "Ð’Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚Ð¸ Ð¾Ð³Ð¾Ð»Ð¾ÑˆÐµÐ½Ð½Ñ Ð· Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ð¾Ð¼ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ñƒ?"
-
-#: aleksis/apps/chronos/model_extensions.py:151
+#: aleksis/apps/chronos/model_extensions.py:145
 msgid "Can view group timetable"
 msgstr "ÐœÐ¾Ð¶Ðµ Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ð°Ñ‚Ð¸ Ð³Ñ€ÑƒÐ¿Ð¾Ð²Ñ– Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ð¸"
 
-#: aleksis/apps/chronos/model_extensions.py:155
+#: aleksis/apps/chronos/model_extensions.py:149
 msgid "Can view person timetable"
 msgstr "ÐœÐ¾Ð¶Ðµ Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ð°Ñ‚Ð¸ Ð¾ÑÐ¾Ð±Ð¸ÑÑ‚Ñ– Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ð¸"
 
-#: aleksis/apps/chronos/models.py:86
+#: aleksis/apps/chronos/models.py:87
 msgid "School term"
 msgstr "ÐÐ°Ð²Ñ‡Ð°Ð»ÑŒÐ½Ð¸Ð¹ Ñ€Ñ–Ðº"
 
-#: aleksis/apps/chronos/models.py:89 aleksis/apps/chronos/models.py:699
+#: aleksis/apps/chronos/models.py:90 aleksis/apps/chronos/models.py:626
+#: aleksis/apps/chronos/models.py:1310
 msgid "Name"
 msgstr "ÐŸÐ¾Ð²Ð½Ðµ Ñ–Ð¼'Ñ"
 
-#: aleksis/apps/chronos/models.py:91 aleksis/apps/chronos/models.py:754
-#: aleksis/apps/chronos/models.py:827 aleksis/apps/chronos/models.py:1061
-#: aleksis/apps/chronos/models.py:829 aleksis/apps/chronos/models.py:1063
+#: aleksis/apps/chronos/models.py:92 aleksis/apps/chronos/models.py:676
+#: aleksis/apps/chronos/models.py:747 aleksis/apps/chronos/models.py:979
 msgid "Start date"
 msgstr "Ð”Ð°Ñ‚Ð° Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ"
 
-#: aleksis/apps/chronos/models.py:92 aleksis/apps/chronos/models.py:755
-#: aleksis/apps/chronos/models.py:828 aleksis/apps/chronos/models.py:1062
-#: aleksis/apps/chronos/models.py:830 aleksis/apps/chronos/models.py:1064
+#: aleksis/apps/chronos/models.py:93 aleksis/apps/chronos/models.py:677
+#: aleksis/apps/chronos/models.py:748 aleksis/apps/chronos/models.py:980
 msgid "End date"
 msgstr "Ð”Ð°Ñ‚Ð° Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ"
 
-#: aleksis/apps/chronos/models.py:111
+#: aleksis/apps/chronos/models.py:112
 msgid "The start date must be earlier than the end date."
 msgstr "ÐŸÐ¾Ñ‡Ð°Ñ‚ÐºÐ¾Ð²Ð° Ð´Ð°Ñ‚Ð° Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð° Ð±ÑƒÑ‚Ð¸ Ñ€Ð°Ð½Ñ–ÑˆÐµ ÐºÑ–Ð½Ñ†ÐµÐ²Ð¾Ñ—."
 
@@ -103,8 +59,7 @@ msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð¸Ð¹ Ð¿ÐµÑ€Ñ–Ð¾Ð´ Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ Ð±ÑƒÑ‚Ð¸ Ð² Ñ€Ð°Ð¼Ðº
 
 #: aleksis/apps/chronos/models.py:125
 msgid "There is already a validity range for this time or a part of this time."
-msgstr ""
-"ÐÐ° Ñ†ÐµÐ¹ Ñ‡Ð°Ñ Ð°Ð±Ð¾ Ð½Ð° Ñ‡Ð°ÑÑ‚Ð¸Ð½Ñƒ Ñ†ÑŒÐ¾Ð³Ð¾ Ñ‡Ð°ÑÑƒ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð¸Ð¹ Ð¿ÐµÑ€Ñ–Ð¾Ð´ Ð²Ð¶Ðµ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ð¹."
+msgstr "ÐÐ° Ñ†ÐµÐ¹ Ñ‡Ð°Ñ Ð°Ð±Ð¾ Ð½Ð° Ñ‡Ð°ÑÑ‚Ð¸Ð½Ñƒ Ñ†ÑŒÐ¾Ð³Ð¾ Ñ‡Ð°ÑÑƒ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð¸Ð¹ Ð¿ÐµÑ€Ñ–Ð¾Ð´ Ð²Ð¶Ðµ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ð¹."
 
 #: aleksis/apps/chronos/models.py:132
 msgid "Validity range"
@@ -114,480 +69,472 @@ msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð¸Ð¹ Ð¿ÐµÑ€Ñ–Ð¾Ð´"
 msgid "Validity ranges"
 msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ñ– Ð¿ÐµÑ€Ñ–Ð¾Ð´Ð¸"
 
-#: aleksis/apps/chronos/models.py:150
+#: aleksis/apps/chronos/models.py:149
 msgid "Week day"
 msgstr "Ð”ÐµÐ½ÑŒ Ñ‚Ð¸Ð¶Ð½Ñ"
 
-#: aleksis/apps/chronos/models.py:152
+#: aleksis/apps/chronos/models.py:151
 msgid "Number of period"
 msgstr "ÐÐ¾Ð¼ÐµÑ€ ÑƒÑ€Ð¾ÐºÐ°"
 
-#: aleksis/apps/chronos/models.py:154
+#: aleksis/apps/chronos/models.py:153
 msgid "Start time"
 msgstr "Ð§Ð°Ñ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ"
 
-#: aleksis/apps/chronos/models.py:155
+#: aleksis/apps/chronos/models.py:154
 msgid "End time"
 msgstr "Ð§Ð°Ñ Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ"
 
-#: aleksis/apps/chronos/models.py:338 aleksis/apps/chronos/models.py:525
-#: aleksis/apps/chronos/models.py:1191 aleksis/apps/chronos/models.py:1193
+#: aleksis/apps/chronos/models.py:324 aleksis/apps/chronos/models.py:496
+#: aleksis/apps/chronos/models.py:1122
 msgid "Time period"
 msgstr "Ð§Ð°Ñ ÑƒÑ€Ð¾ÐºÑƒ"
 
-#: aleksis/apps/chronos/models.py:339
+#: aleksis/apps/chronos/models.py:325
 msgid "Time periods"
 msgstr "Ð§Ð°Ñ ÑƒÑ€Ð¾ÐºÑ–Ð²"
 
-#: aleksis/apps/chronos/models.py:343 aleksis/apps/chronos/models.py:364
-#: aleksis/apps/chronos/models.py:698 aleksis/apps/chronos/models.py:873
-#: aleksis/apps/chronos/models.py:895 aleksis/apps/chronos/models.py:875
-#: aleksis/apps/chronos/models.py:897
+#: aleksis/apps/chronos/models.py:329 aleksis/apps/chronos/models.py:625
+#: aleksis/apps/chronos/models.py:793 aleksis/apps/chronos/models.py:810
 msgid "Short name"
 msgstr "ÐšÐ¾Ñ€Ð¾Ñ‚ÐºÐµ Ñ–Ð¼'Ñ"
 
-#: aleksis/apps/chronos/models.py:344 aleksis/apps/chronos/models.py:365
-#: aleksis/apps/chronos/models.py:874 aleksis/apps/chronos/models.py:896
-#: aleksis/apps/chronos/models.py:876 aleksis/apps/chronos/models.py:898
+#: aleksis/apps/chronos/models.py:330 aleksis/apps/chronos/models.py:794
+#: aleksis/apps/chronos/models.py:811
 msgid "Long name"
 msgstr "Ð”Ð¾Ð²Ð³Ðµ Ñ–Ð¼'Ñ"
 
-#: aleksis/apps/chronos/models.py:346
+#: aleksis/apps/chronos/models.py:332
 msgid "Foreground colour"
 msgstr "ÐžÑÐ½Ð¾Ð²Ð½Ð¸Ð¹ ÐºÐ¾Ð»Ñ–Ñ€"
 
-#: aleksis/apps/chronos/models.py:347
+#: aleksis/apps/chronos/models.py:333
 msgid "Background colour"
 msgstr "ÐšÐ¾Ð»Ñ–Ñ€ Ñ„Ð¾Ð½Ñƒ"
 
-#: aleksis/apps/chronos/models.py:354 aleksis/apps/chronos/models.py:390
-#: aleksis/apps/chronos/models.py:446 aleksis/apps/chronos/models.py:1198
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:47
+#: aleksis/apps/chronos/models.py:340 aleksis/apps/chronos/models.py:349
+#: aleksis/apps/chronos/models.py:416 aleksis/apps/chronos/models.py:1129
+#: aleksis/apps/chronos/models.py:1345
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:2
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:29
-#: aleksis/apps/chronos/models.py:1200
 msgid "Subject"
 msgstr "ÐŸÑ€ÐµÐ´Ð¼ÐµÑ‚"
 
-#: aleksis/apps/chronos/models.py:355
+#: aleksis/apps/chronos/models.py:341
 msgid "Subjects"
 msgstr "ÐŸÑ€ÐµÐ´Ð¼ÐµÑ‚Ð¸"
 
-#: aleksis/apps/chronos/models.py:374
-msgid "Can view room timetable"
-msgstr "ÐœÐ¾Ð¶Ðµ Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ð°Ñ‚Ð¸ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´ ÐºÑ–Ð¼Ð½Ð°Ñ‚Ð¸"
-
-#: aleksis/apps/chronos/models.py:376 aleksis/apps/chronos/models.py:454
-#: aleksis/apps/chronos/models.py:533 aleksis/apps/chronos/models.py:751
-#: aleksis/apps/chronos/models.py:1213
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:48
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
-#: aleksis/apps/chronos/models.py:1215
-msgid "Room"
-msgstr "ÐšÑ–Ð¼Ð½Ð°Ñ‚Ð°"
-
-#: aleksis/apps/chronos/models.py:377 aleksis/apps/chronos/models.py:1078
-#: aleksis/apps/chronos/templates/chronos/all.html:45
-#: aleksis/apps/chronos/models.py:1080
-msgid "Rooms"
-msgstr "ÐšÑ–Ð¼Ð½Ð°Ñ‚Ð¸"
-
-#: aleksis/apps/chronos/models.py:393 aleksis/apps/chronos/models.py:452
-#: aleksis/apps/chronos/models.py:1080 aleksis/apps/chronos/models.py:1206
-#: aleksis/apps/chronos/tables.py:35
-#: aleksis/apps/chronos/templates/chronos/all.html:17
+#: aleksis/apps/chronos/models.py:352 aleksis/apps/chronos/models.py:422
+#: aleksis/apps/chronos/models.py:998 aleksis/apps/chronos/models.py:1137
+#: aleksis/apps/chronos/models.py:1338
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:3
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:28
-#: aleksis/apps/chronos/models.py:1082 aleksis/apps/chronos/models.py:1208
+#: aleksis/apps/chronos/templates/chronos/supervision_event_description.txt:1
 msgid "Teachers"
 msgstr "Ð’Ð¸ÐºÐ»Ð°Ð´Ð°Ñ‡Ñ–"
 
-#: aleksis/apps/chronos/models.py:399
+#: aleksis/apps/chronos/models.py:358
 msgid "Periods"
 msgstr "Ð“Ð¾Ð´Ð¸Ð½Ð¸"
 
-#: aleksis/apps/chronos/models.py:401 aleksis/apps/chronos/models.py:1077
-#: aleksis/apps/chronos/models.py:1201 aleksis/apps/chronos/tables.py:34
-#: aleksis/apps/chronos/templates/chronos/all.html:31
-#: aleksis/apps/chronos/models.py:1079 aleksis/apps/chronos/models.py:1203
+#: aleksis/apps/chronos/models.py:360 aleksis/apps/chronos/models.py:995
+#: aleksis/apps/chronos/models.py:1132 aleksis/apps/chronos/models.py:1326
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:1
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:26
 msgid "Groups"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¸"
 
-#: aleksis/apps/chronos/models.py:424 aleksis/apps/chronos/models.py:519
-#: aleksis/apps/chronos/models.py:795
+#: aleksis/apps/chronos/models.py:394 aleksis/apps/chronos/models.py:490
+#: aleksis/apps/chronos/models.py:716 aleksis/apps/chronos/models.py:1430
+#: aleksis/apps/chronos/models.py:1454
 msgid "Lesson"
 msgstr "Ð£Ñ€Ð¾Ðº"
 
-#: aleksis/apps/chronos/models.py:425
-#: aleksis/apps/chronos/templates/chronos/lessons_day.html:9
-#: aleksis/apps/chronos/templates/chronos/lessons_day.html:19
+#: aleksis/apps/chronos/models.py:395 aleksis/apps/chronos/models.py:1306
 msgid "Lessons"
 msgstr "Ð£Ñ€Ð¾ÐºÐ¸"
 
-#: aleksis/apps/chronos/models.py:433 aleksis/apps/chronos/models.py:1185
-#: aleksis/apps/chronos/models.py:1187
+#: aleksis/apps/chronos/models.py:403 aleksis/apps/chronos/models.py:1116
 msgid "Week"
 msgstr "Ð¢Ð¸Ð¶Ð´ÐµÐ½ÑŒ"
 
-#: aleksis/apps/chronos/models.py:434 aleksis/apps/chronos/models.py:1186
-#: aleksis/apps/chronos/models.py:1188
+#: aleksis/apps/chronos/models.py:404 aleksis/apps/chronos/models.py:1117
 msgid "Year"
 msgstr "Ð Ñ–Ðº"
 
-#: aleksis/apps/chronos/models.py:437 aleksis/apps/chronos/models.py:654
+#: aleksis/apps/chronos/models.py:407 aleksis/apps/chronos/models.py:620
 msgid "Lesson period"
 msgstr "Ð£Ñ€Ð¾Ðº Ð·Ð° Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ð¾Ð¼"
 
-#: aleksis/apps/chronos/models.py:456
+#: aleksis/apps/chronos/models.py:425 aleksis/apps/chronos/models.py:504
+#: aleksis/apps/chronos/models.py:673 aleksis/apps/chronos/models.py:1144
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:30
+msgid "Room"
+msgstr "ÐšÑ–Ð¼Ð½Ð°Ñ‚Ð°"
+
+#: aleksis/apps/chronos/models.py:428
 msgid "Cancelled?"
 msgstr "Ð¡ÐºÐ°ÑÐ¾Ð²Ð°Ð½Ð¾?"
 
-#: aleksis/apps/chronos/models.py:458
+#: aleksis/apps/chronos/models.py:430
 msgid "Cancelled for teachers?"
 msgstr "Ð¡ÐºÐ°ÑÐ¾Ð²Ð°Ð½Ð¾ Ð´Ð»Ñ Ð²Ð¸ÐºÐ»Ð°Ð´Ð°Ñ‡Ñ–Ð²?"
 
-#: aleksis/apps/chronos/models.py:461 aleksis/apps/chronos/models.py:770
-#: aleksis/apps/chronos/models.py:813 aleksis/apps/chronos/models.py:1216
-#: aleksis/apps/chronos/models.py:815 aleksis/apps/chronos/models.py:1218
+#: aleksis/apps/chronos/models.py:433 aleksis/apps/chronos/models.py:692
+#: aleksis/apps/chronos/models.py:734 aleksis/apps/chronos/models.py:1147
+#: aleksis/apps/chronos/models.py:1357
 msgid "Comment"
 msgstr "ÐšÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ñ€"
 
-#: aleksis/apps/chronos/models.py:465
+#: aleksis/apps/chronos/models.py:437
 msgid "Lessons can only be either substituted or cancelled."
 msgstr "Ð£Ñ€Ð¾ÐºÐ¸ Ð¼Ð¾Ð¶ÑƒÑ‚ÑŒ Ð±ÑƒÑ‚Ð¸ Ð»Ð¸ÑˆÐµ Ð°Ð±Ð¾ Ð·Ð°Ð¼Ñ–Ð½ÐµÐ½Ñ–, Ð°Ð±Ð¾ ÑÐºÐ°ÑÐ¾Ð²Ð°Ð½Ñ–."
 
-#: aleksis/apps/chronos/models.py:506
+#: aleksis/apps/chronos/models.py:477
 msgid "Lesson substitution"
 msgstr "Ð—Ð°Ð¼Ñ–Ð½Ð° ÑƒÑ€Ð¾ÐºÑƒ"
 
-#: aleksis/apps/chronos/models.py:507
+#: aleksis/apps/chronos/models.py:478
 msgid "Lesson substitutions"
 msgstr "Ð—Ð°Ð¼Ñ–Ð½Ð¸ ÑƒÑ€Ð¾ÐºÑ–Ð²"
 
-#: aleksis/apps/chronos/models.py:655
+#: aleksis/apps/chronos/models.py:621
 msgid "Lesson periods"
 msgstr "ÐÐ°Ð²Ñ‡Ð°Ð»ÑŒÐ½Ñ– Ð³Ð¾Ð´Ð¸Ð½Ð¸"
 
-#: aleksis/apps/chronos/models.py:693
-msgid "Timetable widget"
-msgstr "Ð’Ñ–Ð´Ð¶ÐµÑ‚ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ñƒ"
-
-#: aleksis/apps/chronos/models.py:694
-msgid "Timetable widgets"
-msgstr "Ð’Ñ–Ð´Ð¶ÐµÑ‚Ð¸ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ñƒ"
-
-#: aleksis/apps/chronos/models.py:708 aleksis/apps/chronos/models.py:726
+#: aleksis/apps/chronos/models.py:635 aleksis/apps/chronos/models.py:648
 msgid "Absence reason"
 msgstr "ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð° Ð²Ñ–Ð´ÑÑƒÑ‚Ð½Ð¾ÑÑ‚Ñ–"
 
-#: aleksis/apps/chronos/models.py:709
+#: aleksis/apps/chronos/models.py:636
 msgid "Absence reasons"
 msgstr "ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð¸ Ð²Ñ–Ð´ÑÑƒÑ‚Ð½Ð¾ÑÑ‚Ñ–"
 
-#: aleksis/apps/chronos/models.py:735 aleksis/apps/chronos/models.py:974
-#: aleksis/apps/chronos/models.py:1025
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:46
-#: aleksis/apps/chronos/models.py:976 aleksis/apps/chronos/models.py:1027
+#: aleksis/apps/chronos/models.py:657 aleksis/apps/chronos/models.py:889
+#: aleksis/apps/chronos/models.py:943
 msgid "Teacher"
 msgstr "Ð’Ð¸ÐºÐ»Ð°Ð´Ð°Ñ‡"
 
-#: aleksis/apps/chronos/models.py:743
+#: aleksis/apps/chronos/models.py:665
 msgid "Group"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð°"
 
-#: aleksis/apps/chronos/models.py:759 aleksis/apps/chronos/models.py:802
+#: aleksis/apps/chronos/models.py:681 aleksis/apps/chronos/models.py:723
 msgid "Start period"
 msgstr "ÐŸÐ¾Ñ‡Ð°Ñ‚Ð¾Ðº ÑƒÑ€Ð¾ÐºÑ–Ð²"
 
-#: aleksis/apps/chronos/models.py:766 aleksis/apps/chronos/models.py:808
-#: aleksis/apps/chronos/models.py:809
+#: aleksis/apps/chronos/models.py:688 aleksis/apps/chronos/models.py:729
 msgid "End period"
 msgstr "Ð—Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ ÑƒÑ€Ð¾ÐºÑ–Ð²"
 
-#: aleksis/apps/chronos/models.py:780
+#: aleksis/apps/chronos/models.py:702
 msgid "Unknown absence"
 msgstr "Ð’Ñ–Ð´ÑÑƒÑ‚Ð½Ñ–ÑÑ‚ÑŒ Ð±ÐµÐ· Ð¿Ð¾ÑÑÐ½ÐµÐ½ÑŒ"
 
-#: aleksis/apps/chronos/models.py:786
+#: aleksis/apps/chronos/models.py:707
 msgid "Absence"
 msgstr "Ð’Ñ–Ð´ÑÑƒÑ‚Ð½Ñ–ÑÑ‚ÑŒ"
 
-#: aleksis/apps/chronos/models.py:787
+#: aleksis/apps/chronos/models.py:708
 msgid "Absences"
 msgstr "Ð’Ñ–Ð´ÑÑƒÑ‚Ð½Ð¾ÑÑ‚Ñ–"
 
-#: aleksis/apps/chronos/models.py:798
+#: aleksis/apps/chronos/models.py:719
 msgid "Date of exam"
 msgstr "Ð”Ð°Ñ‚Ð° Ñ–ÑÐ¿Ð¸Ñ‚Ñƒ"
 
-#: aleksis/apps/chronos/models.py:812 aleksis/apps/chronos/models.py:826
-#: aleksis/apps/chronos/models.py:1059 aleksis/apps/chronos/models.py:814
-#: aleksis/apps/chronos/models.py:828 aleksis/apps/chronos/models.py:1061
+#: aleksis/apps/chronos/models.py:733 aleksis/apps/chronos/models.py:746
+#: aleksis/apps/chronos/models.py:977
 msgid "Title"
 msgstr "ÐÐ°Ð·Ð²Ð°"
 
-#: aleksis/apps/chronos/models.py:819 aleksis/apps/chronos/models.py:821
+#: aleksis/apps/chronos/models.py:739
 msgid "Exam"
 msgstr "Ð†ÑÐ¿Ð¸Ñ‚"
 
-#: aleksis/apps/chronos/models.py:820 aleksis/apps/chronos/models.py:822
+#: aleksis/apps/chronos/models.py:740
 msgid "Exams"
 msgstr "Ð†ÑÐ¿Ð¸Ñ‚Ð¸"
 
-#: aleksis/apps/chronos/models.py:829 aleksis/apps/chronos/models.py:831
+#: aleksis/apps/chronos/models.py:749
 msgid "Comments"
 msgstr "ÐšÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ñ–"
 
-#: aleksis/apps/chronos/models.py:868 aleksis/apps/chronos/models.py:870
+#: aleksis/apps/chronos/models.py:788
 msgid "Holiday"
 msgstr "Ð’Ð¸Ñ…Ñ–Ð´Ð½Ð¸Ð¹"
 
-#: aleksis/apps/chronos/models.py:869 aleksis/apps/chronos/models.py:871
+#: aleksis/apps/chronos/models.py:789
 msgid "Holidays"
 msgstr "Ð’Ð¸Ñ…Ñ–Ð´Ð½Ñ–"
 
-#: aleksis/apps/chronos/models.py:883 aleksis/apps/chronos/models.py:964
-#: aleksis/apps/chronos/models.py:885 aleksis/apps/chronos/models.py:966
+#: aleksis/apps/chronos/models.py:803 aleksis/apps/chronos/models.py:879
 msgid "Supervision area"
 msgstr "Ð—Ð¾Ð½Ð° ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŽ"
 
-#: aleksis/apps/chronos/models.py:884 aleksis/apps/chronos/models.py:886
+#: aleksis/apps/chronos/models.py:804
 msgid "Supervision areas"
 msgstr "Ð—Ð¾Ð½Ð¸ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŽ"
 
-#: aleksis/apps/chronos/models.py:901 aleksis/apps/chronos/models.py:903
+#: aleksis/apps/chronos/models.py:816
 msgid "Time period after break starts"
 msgstr "ÐÐ°Ð²Ñ‡Ð°Ð½Ð½Ñ Ð¿Ñ–ÑÐ»Ñ Ð¿ÐµÑ€ÐµÑ€Ð²Ð¸ Ð¿Ð¾Ñ‡Ð¸Ð½Ð°Ñ”Ñ‚ÑŒÑÑ"
 
-#: aleksis/apps/chronos/models.py:909 aleksis/apps/chronos/models.py:911
+#: aleksis/apps/chronos/models.py:824
 msgid "Time period before break ends"
 msgstr "ÐÐ°Ð²Ñ‡Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÐµÐ´ Ð¿ÐµÑ€ÐµÑ€Ð²Ð¾ÑŽ Ð·Ð°ÐºÑ–Ð½Ñ‡ÑƒÑ”Ñ‚ÑŒÑÑ"
 
-#: aleksis/apps/chronos/models.py:949 aleksis/apps/chronos/models.py:968
-#: aleksis/apps/chronos/models.py:951 aleksis/apps/chronos/models.py:970
+#: aleksis/apps/chronos/models.py:864 aleksis/apps/chronos/models.py:883
 msgid "Break"
 msgstr "ÐŸÐµÑ€ÐµÑ€Ð²Ð°"
 
-#: aleksis/apps/chronos/models.py:950 aleksis/apps/chronos/models.py:952
+#: aleksis/apps/chronos/models.py:865
 msgid "Breaks"
 msgstr "ÐŸÐµÑ€ÐµÑ€Ð²Ð¸"
 
-#: aleksis/apps/chronos/models.py:1005 aleksis/apps/chronos/models.py:1018
-#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:23
-#: aleksis/apps/chronos/templates/chronos/partials/supervision.html:15
-#: aleksis/apps/chronos/models.py:1007 aleksis/apps/chronos/models.py:1020
+#: aleksis/apps/chronos/models.py:923 aleksis/apps/chronos/models.py:936
+#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:3
 msgid "Supervision"
 msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒ"
 
-#: aleksis/apps/chronos/models.py:1006 aleksis/apps/chronos/models.py:1008
+#: aleksis/apps/chronos/models.py:924 aleksis/apps/chronos/models.py:1622
 msgid "Supervisions"
 msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ñ–"
 
-#: aleksis/apps/chronos/models.py:1014 aleksis/apps/chronos/models.py:1016
+#: aleksis/apps/chronos/models.py:932
 msgid "Date"
 msgstr "Ð”Ð°Ñ‚Ð°"
 
-#: aleksis/apps/chronos/models.py:1048 aleksis/apps/chronos/models.py:1050
+#: aleksis/apps/chronos/models.py:966
 msgid "Supervision substitution"
 msgstr "Ð—Ð°Ð¼Ñ–Ð½Ð° ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŽ"
 
-#: aleksis/apps/chronos/models.py:1049 aleksis/apps/chronos/models.py:1051
+#: aleksis/apps/chronos/models.py:967
 msgid "Supervision substitutions"
 msgstr "Ð—Ð°Ð¼Ñ–Ð½Ð¸ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŽ"
 
-#: aleksis/apps/chronos/models.py:1067 aleksis/apps/chronos/models.py:1069
+#: aleksis/apps/chronos/models.py:985
 msgid "Start time period"
 msgstr "ÐŸÐ¾Ñ‡Ð°Ñ‚Ð¾Ðº Ð½Ð°Ð²Ñ‡Ð°Ð½Ð½Ñ"
 
-#: aleksis/apps/chronos/models.py:1073 aleksis/apps/chronos/models.py:1075
+#: aleksis/apps/chronos/models.py:991
 msgid "End time period"
 msgstr "Ð—Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ Ð½Ð°Ð²Ñ‡Ð°Ð½Ð½Ñ"
 
-#: aleksis/apps/chronos/models.py:1087 aleksis/apps/chronos/models.py:1089
+#: aleksis/apps/chronos/models.py:996 aleksis/apps/chronos/models.py:1332
+#: aleksis/apps/chronos/templates/chronos/lesson_event_description.txt:4
+msgid "Rooms"
+msgstr "ÐšÑ–Ð¼Ð½Ð°Ñ‚Ð¸"
+
+#: aleksis/apps/chronos/models.py:1005
 #, python-brace-format
 msgid "Event {pk}"
 msgstr "ÐŸÐ¾Ð´Ñ–Ñ {pk}"
 
-#: aleksis/apps/chronos/models.py:1172
-#: aleksis/apps/chronos/templates/chronos/partials/subs/subject.html:27
-#: aleksis/apps/chronos/models.py:1174
+#: aleksis/apps/chronos/models.py:1103
 msgid "Event"
 msgstr "ÐŸÐ¾Ð´Ñ–Ñ"
 
-#: aleksis/apps/chronos/models.py:1173 aleksis/apps/chronos/models.py:1175
+#: aleksis/apps/chronos/models.py:1104
 msgid "Events"
 msgstr "ÐŸÐ¾Ð´Ñ–Ñ—"
 
-#: aleksis/apps/chronos/models.py:1221
+#: aleksis/apps/chronos/models.py:1152
 msgid "Related exam"
 msgstr "ÐŸÐ¾Ð²'ÑÐ·Ð°Ð½Ñ– Ñ–ÑÐ¿Ð¸Ñ‚Ð¸"
 
-#: aleksis/apps/chronos/models.py:1251 aleksis/apps/chronos/models.py:1244
+#: aleksis/apps/chronos/models.py:1181
 msgid "Extra lesson"
 msgstr "Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¸Ð¹ ÑƒÑ€Ð¾Ðº"
 
-#: aleksis/apps/chronos/models.py:1252 aleksis/apps/chronos/models.py:1245
+#: aleksis/apps/chronos/models.py:1182
 msgid "Extra lessons"
 msgstr "Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ñ– ÑƒÑ€Ð¾ÐºÐ¸"
 
-#: aleksis/apps/chronos/models.py:1264 aleksis/apps/chronos/models.py:1257
+#: aleksis/apps/chronos/models.py:1194
 msgid "Number of days shown in the plan"
 msgstr "ÐšÑ–Ð»ÑŒÐºÑ–ÑÑ‚ÑŒ Ð´Ð½Ñ–Ð² Ð´Ð»Ñ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ñƒ Ð¿Ð»Ð°Ð½Ñ–"
 
-#: aleksis/apps/chronos/models.py:1268 aleksis/apps/chronos/models.py:1261
+#: aleksis/apps/chronos/models.py:1198
 msgid "Show header box"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº"
 
-#: aleksis/apps/chronos/models.py:1269 aleksis/apps/chronos/preferences.py:61
-#: aleksis/apps/chronos/models.py:1262
+#: aleksis/apps/chronos/models.py:1199 aleksis/apps/chronos/preferences.py:100
 msgid "The header box shows affected teachers/groups."
 msgstr "Ð—Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð¿Ð¾ÐºÐ°Ð·ÑƒÑ” Ð²Ð¸ÐºÐ»Ð°Ð´Ð°Ñ‡Ñ–Ð²/Ð³Ñ€ÑƒÐ¿Ð¸ Ð½Ð° ÑÐºÐ¸Ñ… Ñ†Ðµ Ð²Ð¿Ð»Ð¸Ð²Ð°Ñ”."
 
-#: aleksis/apps/chronos/models.py:1276 aleksis/apps/chronos/models.py:1269
+#: aleksis/apps/chronos/models.py:1206
 msgid "Revision which triggered the last update"
 msgstr "Ð ÐµÐ²Ñ–Ð·Ñ–Ñ, ÑÐºÐ° Ð·Ð°Ð¿ÑƒÑÑ‚Ð¸Ð»Ð° Ð¾ÑÑ‚Ð°Ð½Ð½Ñ” Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ"
 
-#: aleksis/apps/chronos/models.py:1337 aleksis/apps/chronos/models.py:1330
+#: aleksis/apps/chronos/models.py:1278
 msgid "Automatic plan"
 msgstr "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¸Ð¹ Ð¿Ð»Ð°Ð½"
 
-#: aleksis/apps/chronos/models.py:1338 aleksis/apps/chronos/models.py:1331
+#: aleksis/apps/chronos/models.py:1279
 msgid "Automatic plans"
 msgstr "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ñ– Ð¿Ð»Ð°Ð½Ð¸"
 
-#: aleksis/apps/chronos/models.py:1352 aleksis/apps/chronos/models.py:1345
+#: aleksis/apps/chronos/models.py:1293
 msgid "Can view all room timetables"
 msgstr "ÐœÐ¾Ð¶Ðµ Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ð°Ñ‚Ð¸ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ð¸ ÑƒÑÑ–Ñ… ÐºÑ–Ð¼Ð½Ð°Ñ‚"
 
-#: aleksis/apps/chronos/models.py:1353 aleksis/apps/chronos/models.py:1346
+#: aleksis/apps/chronos/models.py:1294
 msgid "Can view all group timetables"
 msgstr "ÐœÐ¾Ð¶Ðµ Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ð°Ñ‚Ð¸ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ð¸ ÑƒÑÑ–Ñ… Ð³Ñ€ÑƒÐ¿"
 
-#: aleksis/apps/chronos/models.py:1354 aleksis/apps/chronos/models.py:1347
+#: aleksis/apps/chronos/models.py:1295
 msgid "Can view all person timetables"
 msgstr "ÐœÐ¾Ð¶Ðµ Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ð°Ñ‚Ð¸ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ð¸ ÑƒÑÑ–Ñ… Ð¾ÑÑ–Ð±"
 
-#: aleksis/apps/chronos/models.py:1355 aleksis/apps/chronos/models.py:1348
+#: aleksis/apps/chronos/models.py:1296
 msgid "Can view timetable overview"
 msgstr "ÐœÐ¾Ð¶Ðµ Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ð°Ñ‚Ð¸ Ð·Ð°Ð³Ð°Ð»ÑŒÐ½Ð¸Ð¹ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´"
 
-#: aleksis/apps/chronos/models.py:1356 aleksis/apps/chronos/models.py:1349
+#: aleksis/apps/chronos/models.py:1297
 msgid "Can view all lessons per day"
 msgstr "ÐœÐ¾Ð¶Ðµ Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ð°Ñ‚Ð¸ ÑƒÑÑ– ÑƒÑ€Ð¾ÐºÐ¸ Ð¾ÐºÑ€ÐµÐ¼Ð¾Ð³Ð¾ Ð´Ð½Ñ"
 
-#: aleksis/apps/chronos/preferences.py:18
-msgid "Use parent groups in timetable views"
-msgstr "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð±Ð°Ñ‚ÑŒÐºÑ–Ð²ÑÑŒÐºÑ– Ð³Ñ€ÑƒÐ¿Ð¸ Ð² Ð¾Ð³Ð»ÑÐ´Ñ– Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ñƒ"
+#: aleksis/apps/chronos/models.py:1298
+#, fuzzy
+#| msgid "Can view all lessons per day"
+msgid "Can view all supervisions per day"
+msgstr "ÐœÐ¾Ð¶Ðµ Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ð°Ñ‚Ð¸ ÑƒÑÑ– ÑƒÑ€Ð¾ÐºÐ¸ Ð¾ÐºÑ€ÐµÐ¼Ð¾Ð³Ð¾ Ð´Ð½Ñ"
 
-#: aleksis/apps/chronos/preferences.py:20
-msgid ""
-"If an lesson or substitution has only one group and this group has parent "
-"groups, show the parent groups instead of the original group."
+#: aleksis/apps/chronos/models.py:1313
+#, fuzzy
+#| msgid "Start time"
+msgid "Start slot number"
+msgstr "Ð§Ð°Ñ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ"
+
+#: aleksis/apps/chronos/models.py:1316
+#, fuzzy
+#| msgid "End time"
+msgid "End slot number"
+msgstr "Ð§Ð°Ñ Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ"
+
+#: aleksis/apps/chronos/models.py:1320
+msgid "Course"
 msgstr ""
-"Ð¯ÐºÑ‰Ð¾ ÑƒÑ€Ð¾Ðº Ð°Ð±Ð¾ Ð·Ð°Ð¼Ñ–Ð½Ð° Ð¼Ð°Ñ” Ð»Ð¸ÑˆÐµ Ð¾Ð´Ð½Ñƒ Ð³Ñ€ÑƒÐ¿Ñƒ Ñ– Ñ†Ñ Ð³Ñ€ÑƒÐ¿Ð° Ð¼Ð°Ñ” Ð±Ð°Ñ‚ÑŒÐºÑ–Ð²ÑÑŒÐºÑ– Ð³Ñ€ÑƒÐ¿Ð¸, "
-"Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚Ð¸ Ñ†Ñ– Ð±Ð°Ñ‚ÑŒÐºÑ–Ð²ÑÑŒÐºÑ– Ð³Ñ€ÑƒÐ¿Ð¸ Ð·Ð°Ð¼Ñ–ÑÑ‚ÑŒ Ð´Ñ–Ð¹ÑÐ½Ð¾Ñ— Ð³Ñ€ÑƒÐ¿Ð¸."
+
+#: aleksis/apps/chronos/models.py:1353
+#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:4
+msgid "Cancelled"
+msgstr "Ð¡ÐºÐ°ÑÐ¾Ð²Ð°Ð½Ð¾"
+
+#: aleksis/apps/chronos/models.py:1401 aleksis/apps/chronos/models.py:1413
+#: aleksis/apps/chronos/models.py:1425
+msgid "{} (instead of {})"
+msgstr ""
+
+#: aleksis/apps/chronos/models.py:1614
+#, fuzzy
+#| msgid "Lesson"
+msgid "Lesson Event"
+msgstr "Ð£Ñ€Ð¾Ðº"
+
+#: aleksis/apps/chronos/models.py:1615
+#, fuzzy
+#| msgid "Lessons"
+msgid "Lesson Events"
+msgstr "Ð£Ñ€Ð¾ÐºÐ¸"
+
+#: aleksis/apps/chronos/models.py:1630
+#, fuzzy
+#| msgid "Supervision"
+msgid "Supervision: {}"
+msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒ"
+
+#: aleksis/apps/chronos/preferences.py:21
+msgid "Timetables"
+msgstr "Ð Ð¾Ð·ÐºÐ»Ð°Ð´Ð¸"
+
+#: aleksis/apps/chronos/preferences.py:29
+msgid "Use parent groups in timetable views"
+msgstr "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð±Ð°Ñ‚ÑŒÐºÑ–Ð²ÑÑŒÐºÑ– Ð³Ñ€ÑƒÐ¿Ð¸ Ð² Ð¾Ð³Ð»ÑÐ´Ñ– Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ñƒ"
 
 #: aleksis/apps/chronos/preferences.py:31
+#, fuzzy
+#| msgid "If an lesson or substitution has only one group and this group has parent groups, show the parent groups instead of the original group."
+msgid "If a lesson or substitution has only one group and this group has parent groups, show the parent groups instead of the original group."
+msgstr "Ð¯ÐºÑ‰Ð¾ ÑƒÑ€Ð¾Ðº Ð°Ð±Ð¾ Ð·Ð°Ð¼Ñ–Ð½Ð° Ð¼Ð°Ñ” Ð»Ð¸ÑˆÐµ Ð¾Ð´Ð½Ñƒ Ð³Ñ€ÑƒÐ¿Ñƒ Ñ– Ñ†Ñ Ð³Ñ€ÑƒÐ¿Ð° Ð¼Ð°Ñ” Ð±Ð°Ñ‚ÑŒÐºÑ–Ð²ÑÑŒÐºÑ– Ð³Ñ€ÑƒÐ¿Ð¸, Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚Ð¸ Ñ†Ñ– Ð±Ð°Ñ‚ÑŒÐºÑ–Ð²ÑÑŒÐºÑ– Ð³Ñ€ÑƒÐ¿Ð¸ Ð·Ð°Ð¼Ñ–ÑÑ‚ÑŒ Ð´Ñ–Ð¹ÑÐ½Ð¾Ñ— Ð³Ñ€ÑƒÐ¿Ð¸."
+
+#: aleksis/apps/chronos/preferences.py:42
 msgid "Shorten groups in timetable views"
 msgstr "Ð¡ÐºÐ¾Ñ€Ð¾Ñ‡ÑƒÐ²Ð°Ñ‚Ð¸ Ð³Ñ€ÑƒÐ¿Ð¸ Ð² Ð¾Ð³Ð»ÑÐ´Ñ– Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ñƒ"
 
-#: aleksis/apps/chronos/preferences.py:32
+#: aleksis/apps/chronos/preferences.py:43
 msgid "If there are more groups than the set limit, they will be collapsed."
 msgstr "Ð¯ÐºÑ‰Ð¾ Ð³Ñ€ÑƒÐ¿ Ð±Ñ–Ð»ÑŒÑˆÐµ Ð·Ð° Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹ Ð»Ñ–Ð¼Ñ–Ñ‚, Ð²Ð¾Ð½Ð¸ Ð±ÑƒÐ´ÑƒÑ‚ÑŒ Ð·Ð³Ñ€ÑƒÐ¿Ð¾Ð²Ð°Ð½Ñ–."
 
-#: aleksis/apps/chronos/preferences.py:40
+#: aleksis/apps/chronos/preferences.py:51
 msgid "Limit of groups for shortening of groups"
 msgstr "Ð›Ñ–Ð¼Ñ–Ñ‚ Ð³Ñ€ÑƒÐ¿ Ð´Ð»Ñ ÑÐºÐ¾Ñ€Ð¾Ñ‡ÐµÐ½Ð½Ñ Ð³Ñ€ÑƒÐ¿"
 
-#: aleksis/apps/chronos/preferences.py:42
-msgid ""
-"If an user activates shortening of groups,they will be collapsed if there "
-"are more groups than this limit."
+#: aleksis/apps/chronos/preferences.py:53
+#, fuzzy
+#| msgid "If an user activates shortening of groups,they will be collapsed if there are more groups than this limit."
+msgid "If a user activates shortening of groups,they will be collapsed if there are more groups than this limit."
+msgstr "Ð¯ÐºÑ‰Ð¾ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ Ð°ÐºÑ‚Ð¸Ð²ÑƒÑ” ÑÐºÐ¾Ñ€Ð¾Ñ‡ÐµÐ½Ð½Ñ Ð³Ñ€ÑƒÐ¿, Ñ– ÐºÑ–Ð»ÑŒÐºÑ–ÑÑ‚ÑŒ Ð³Ñ€ÑƒÐ¿ Ð±ÑƒÐ´Ðµ Ð±Ñ–Ð»ÑŒÑˆÐµ Ð·Ð° Ð»Ñ–Ð¼Ñ–Ñ‚, Ð²Ð¾Ð½Ð¸ Ð·Ð³Ñ€ÑƒÐ¿Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸Ð¼ÑƒÑ‚ÑŒÑÑ."
+
+#: aleksis/apps/chronos/preferences.py:65
+#, fuzzy
+#| msgid "Lesson substitutions"
+msgid "Relevant days for substitution plans"
+msgstr "Ð—Ð°Ð¼Ñ–Ð½Ð¸ ÑƒÑ€Ð¾ÐºÑ–Ð²"
+
+#: aleksis/apps/chronos/preferences.py:82
+msgid "Time when substitution plans switch to the next day"
 msgstr ""
-"Ð¯ÐºÑ‰Ð¾ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ Ð°ÐºÑ‚Ð¸Ð²ÑƒÑ” ÑÐºÐ¾Ñ€Ð¾Ñ‡ÐµÐ½Ð½Ñ Ð³Ñ€ÑƒÐ¿, Ñ– ÐºÑ–Ð»ÑŒÐºÑ–ÑÑ‚ÑŒ Ð³Ñ€ÑƒÐ¿ Ð±ÑƒÐ´Ðµ Ð±Ñ–Ð»ÑŒÑˆÐµ Ð·Ð° "
-"Ð»Ñ–Ð¼Ñ–Ñ‚, Ð²Ð¾Ð½Ð¸ Ð·Ð³Ñ€ÑƒÐ¿Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸Ð¼ÑƒÑ‚ÑŒÑÑ."
 
-#: aleksis/apps/chronos/preferences.py:52
+#: aleksis/apps/chronos/preferences.py:91
 msgid "Number of days shown on substitutions print view"
 msgstr "ÐšÑ–Ð»ÑŒÐºÑ–ÑÑ‚ÑŒ Ð´Ð½Ñ–Ð² Ð´Ð»Ñ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ñƒ Ð´Ñ€ÑƒÐºÐ¾Ð²Ð°Ð½Ð¾Ð¼Ñƒ Ð²Ð¸Ð³Ð»ÑÐ´Ñ– Ð·Ð°Ð¼Ñ–Ð½"
 
-#: aleksis/apps/chronos/preferences.py:60
+#: aleksis/apps/chronos/preferences.py:99
 msgid "Show header box in substitution views"
 msgstr "Ð’Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚Ð¸ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð² Ð¾Ð³Ð»ÑÐ´Ñ– Ð·Ð°Ð¼Ñ–Ð½"
 
-#: aleksis/apps/chronos/preferences.py:70
-msgid ""
-"Show parent groups in header box in substitution views instead of original "
-"groups"
-msgstr ""
-"Ð£ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÑƒ Ð² Ð¾Ð³Ð»ÑÐ´Ñ– Ð·Ð°Ð¼Ñ–Ð½ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚Ð¸ Ð±Ð°Ñ‚ÑŒÐºÑ–Ð²ÑÑŒÐºÑ– Ð³Ñ€ÑƒÐ¿Ð¸ Ð·Ð°Ð¼Ñ–ÑÑ‚ÑŒ Ð´Ñ–Ð¹ÑÐ½Ð¸Ñ… Ð³Ñ€ÑƒÐ¿"
+#: aleksis/apps/chronos/preferences.py:109
+msgid "Show parent groups in header box in substitution views instead of original groups"
+msgstr "Ð£ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÑƒ Ð² Ð¾Ð³Ð»ÑÐ´Ñ– Ð·Ð°Ð¼Ñ–Ð½ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚Ð¸ Ð±Ð°Ñ‚ÑŒÐºÑ–Ð²ÑÑŒÐºÑ– Ð³Ñ€ÑƒÐ¿Ð¸ Ð·Ð°Ð¼Ñ–ÑÑ‚ÑŒ Ð´Ñ–Ð¹ÑÐ½Ð¸Ñ… Ð³Ñ€ÑƒÐ¿"
 
-#: aleksis/apps/chronos/preferences.py:79
-msgid ""
-"How many days in advance users should be notified about timetable changes?"
-msgstr ""
-"Ð—Ð° ÑÐºÑ–Ð»ÑŒÐºÐ¸ Ð´Ð½Ñ–Ð² Ð¿Ð¾Ñ‚Ñ€Ñ–Ð±Ð½Ð¾ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼ÑƒÐ²Ð°Ñ‚Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð² Ñ‰Ð¾Ð´Ð¾ Ð·Ð¼Ñ–Ð½ Ñƒ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ñ–?"
+#: aleksis/apps/chronos/preferences.py:118
+msgid "How many days in advance users should be notified about timetable changes?"
+msgstr "Ð—Ð° ÑÐºÑ–Ð»ÑŒÐºÐ¸ Ð´Ð½Ñ–Ð² Ð¿Ð¾Ñ‚Ñ€Ñ–Ð±Ð½Ð¾ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼ÑƒÐ²Ð°Ñ‚Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð² Ñ‰Ð¾Ð´Ð¾ Ð·Ð¼Ñ–Ð½ Ñƒ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ñ–?"
 
-#: aleksis/apps/chronos/preferences.py:87
+#: aleksis/apps/chronos/preferences.py:126
 msgid "Time for sending notifications about timetable changes"
 msgstr "Ð§Ð°Ñ Ð´Ð»Ñ Ð½Ð°Ð´ÑÐ¸Ð»Ð°Ð½Ð½Ñ ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½ÑŒ Ñ‰Ð¾Ð´Ð¾ Ð·Ð¼Ñ–Ð½ Ñƒ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ñ–"
 
-#: aleksis/apps/chronos/preferences.py:90
-msgid ""
-"This is only used for scheduling notifications which doesn't affect the time "
-"period configured above. All other notifications affecting the next days are "
-"sent immediately."
-msgstr ""
-"Ð¦Ðµ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ Ð»Ð¸ÑˆÐµ Ð´Ð»Ñ Ð¿Ð»Ð°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½ÑŒ, ÑÐºÑ– Ð½Ðµ Ð²Ð¿Ð»Ð¸Ð²Ð°ÑŽÑ‚ÑŒ Ð½Ð° "
-"Ð½Ð°Ð²Ñ‡Ð°Ð»ÑŒÐ½Ð¸Ð¹ Ñ‡Ð°Ñ, Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹ Ð²Ð¸Ñ‰Ðµ. Ð£ÑÑ– Ñ–Ð½ÑˆÑ– ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ, ÑÐºÑ– Ð²Ð¿Ð»Ð¸Ð²Ð°ÑŽÑ‚ÑŒ Ð½Ð° "
-"Ð½Ð°Ð¹Ð±Ð»Ð¸Ð¶Ñ‡Ñ– Ð´Ð½Ñ–, Ð½Ð°Ð´ÑÐ¸Ð»Ð°ÑŽÑ‚ÑŒÑÑ Ð½ÐµÐ³Ð°Ð¹Ð½Ð¾."
+#: aleksis/apps/chronos/preferences.py:129
+msgid "This is only used for scheduling notifications which doesn't affect the time period configured above. All other notifications affecting the next days are sent immediately."
+msgstr "Ð¦Ðµ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ Ð»Ð¸ÑˆÐµ Ð´Ð»Ñ Ð¿Ð»Ð°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½ÑŒ, ÑÐºÑ– Ð½Ðµ Ð²Ð¿Ð»Ð¸Ð²Ð°ÑŽÑ‚ÑŒ Ð½Ð° Ð½Ð°Ð²Ñ‡Ð°Ð»ÑŒÐ½Ð¸Ð¹ Ñ‡Ð°Ñ, Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹ Ð²Ð¸Ñ‰Ðµ. Ð£ÑÑ– Ñ–Ð½ÑˆÑ– ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ, ÑÐºÑ– Ð²Ð¿Ð»Ð¸Ð²Ð°ÑŽÑ‚ÑŒ Ð½Ð° Ð½Ð°Ð¹Ð±Ð»Ð¸Ð¶Ñ‡Ñ– Ð´Ð½Ñ–, Ð½Ð°Ð´ÑÐ¸Ð»Ð°ÑŽÑ‚ÑŒÑÑ Ð½ÐµÐ³Ð°Ð¹Ð½Ð¾."
 
-#: aleksis/apps/chronos/preferences.py:101
-#: aleksis/apps/chronos/preferences.py:109
+#: aleksis/apps/chronos/preferences.py:140
+#: aleksis/apps/chronos/preferences.py:148
 msgid "Send notifications for current timetable changes"
 msgstr "ÐÐ°Ð´Ñ–ÑÐ»Ð°Ñ‚Ð¸ ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ñ‰Ð¾Ð´Ð¾ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¸Ñ… Ð·Ð¼Ñ–Ð½ Ñƒ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ñ–"
 
-#: aleksis/apps/chronos/tables.py:41
-msgid "Substitution"
-msgstr "Ð—Ð°Ð¼Ñ–Ð½Ð°"
-
-#: aleksis/apps/chronos/tables.py:43
-msgid "Manage substitution"
-msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ð¼Ñ–Ð½Ð°Ð¼Ð¸"
-
-#: aleksis/apps/chronos/templates/chronos/all.html:25
-msgid "No teachers timetables available."
-msgstr "Ð Ð¾Ð·ÐºÐ»Ð°Ð´Ð¸ Ð²Ð¸ÐºÐ»Ð°Ð´Ð°Ñ‡Ñ–Ð² Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ–."
-
-#: aleksis/apps/chronos/templates/chronos/all.html:39
-msgid "No group timetables available."
-msgstr "Ð Ð¾Ð·ÐºÐ»Ð°Ð´Ð¸ Ð³Ñ€ÑƒÐ¿ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ–."
-
-#: aleksis/apps/chronos/templates/chronos/all.html:53
-msgid "No room timetables available."
-msgstr "Ð Ð¾Ð·ÐºÐ»Ð°Ð´Ð¸ ÐºÑ–Ð¼Ð½Ð°Ñ‚ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ–."
-
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:11
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:6
-msgid "Edit substitution."
-msgstr "Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸ Ð·Ð°Ð¼Ñ–Ð½Ñƒ."
-
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:12
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:7
-msgid "Edit substitution"
-msgstr "Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸ Ð·Ð°Ð¼Ñ–Ð½Ñƒ"
+#: aleksis/apps/chronos/preferences.py:158
+#, fuzzy
+#| msgid "Shorten groups in timetable views"
+msgid "Group types to show in timetables"
+msgstr "Ð¡ÐºÐ¾Ñ€Ð¾Ñ‡ÑƒÐ²Ð°Ñ‚Ð¸ Ð³Ñ€ÑƒÐ¿Ð¸ Ð² Ð¾Ð³Ð»ÑÐ´Ñ– Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ñƒ"
 
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:25
-#: aleksis/apps/chronos/templates/chronos/edit_substitution.html:20
-msgid "Delete"
-msgstr "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸"
+#: aleksis/apps/chronos/preferences.py:159
+msgid "If you leave it empty, all groups will be shown."
+msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:19
-#: aleksis/apps/chronos/templates/chronos/timetable.html:50
-msgid "SMART PLAN"
-msgstr "SMART PLAN"
+#: aleksis/apps/chronos/preferences.py:169
+msgid "Lesson calendar feed color"
+msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/my_timetable.html:22
-msgid "Show week timetable for"
-msgstr "Ð’Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð·Ð¸Ñ‚Ð¸ Ñ‚Ð¸Ð¶Ð½ÐµÐ²Ð¸Ð¹ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´ Ð´Ð»Ñ"
+#: aleksis/apps/chronos/preferences.py:181
+#, fuzzy
+#| msgid "Supervision area"
+msgid "Supervision calendar feed color"
+msgstr "Ð—Ð¾Ð½Ð° ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŽ"
 
 #: aleksis/apps/chronos/templates/chronos/partials/headerbox.html:10
 msgid "Absent teachers"
@@ -605,105 +552,47 @@ msgstr "ÐÐ° ÑÐºÐ¸Ñ… Ð²Ð¸ÐºÐ»Ð°Ð´Ð°Ñ‡Ñ–Ð² Ð²Ð¿Ð»Ð¸Ð²Ð°Ñ”"
 msgid "Affected groups"
 msgstr "ÐÐ° ÑÐºÑ– Ð³Ñ€ÑƒÐ¿Ð¸ Ð²Ð¿Ð»Ð¸Ð²Ð°Ñ”"
 
-#: aleksis/apps/chronos/templates/chronos/partials/lesson.html:27
-msgid "Cancelled due to an event"
-msgstr "Ð¡ÐºÐ°ÑÐ¾Ð²Ð°Ð½Ð¾ Ñ‡ÐµÑ€ÐµÐ· Ð¿Ð¾Ð´Ñ–ÑŽ"
-
-#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:4
-msgid "Cancelled"
-msgstr "Ð¡ÐºÐ°ÑÐ¾Ð²Ð°Ð½Ð¾"
+#: aleksis/apps/chronos/templates/chronos/partials/subs/period.html:12
+msgid "all day"
+msgstr ""
 
-#: aleksis/apps/chronos/templates/chronos/partials/subs/badge.html:6
-msgid "Cancelled for teachers"
-msgstr "Ð¡ÐºÐ°ÑÐ¾Ð²Ð°Ð½Ð¾ Ð´Ð»Ñ Ð²Ð¸ÐºÐ»Ð°Ð´Ð°Ñ‡Ñ–Ð²"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:11
+msgid "Print: Substitutions"
+msgstr "Ð”Ñ€ÑƒÐº: Ð—Ð°Ð¼Ñ–Ð½Ð¸"
 
-#: aleksis/apps/chronos/templates/chronos/partials/today.html:2
-msgid "Today"
-msgstr "Ð¡ÑŒÐ¾Ð³Ð¾Ð´Ð½Ñ–"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:12
+msgid "Substitutions"
+msgstr "Ð—Ð°Ð¼Ñ–Ð½Ð¸"
 
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:14
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:25
-#: aleksis/apps/chronos/templates/chronos/partials/week_select.html:36
-msgid "CW"
-msgstr "Ð¢Ð–"
+#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:27
+#, fuzzy
+#| msgid "Timetable"
+msgid "Time"
+msgstr "Ð Ð¾Ð·ÐºÐ»Ð°Ð´"
 
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:49
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:31
 msgid "Notes"
 msgstr "ÐÐ¾Ñ‚Ð°Ñ‚ÐºÐ¸"
 
-#: aleksis/apps/chronos/templates/chronos/substitutions.html:57
 #: aleksis/apps/chronos/templates/chronos/substitutions_print.html:41
 msgid "No substitutions available."
 msgstr "Ð—Ð°Ð¼Ñ–Ð½Ð¸ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ–."
 
-#: aleksis/apps/chronos/templates/chronos/substitutions_print.html:11
-msgid "Print: Substitutions"
-msgstr "Ð”Ñ€ÑƒÐº: Ð—Ð°Ð¼Ñ–Ð½Ð¸"
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:11
-#: aleksis/apps/chronos/templates/chronos/timetable.html:24
-#: aleksis/apps/chronos/templates/chronos/timetable_print.html:11
-#: aleksis/apps/chronos/util/notifications.py:206
-msgid "Timetable"
-msgstr "Ð Ð¾Ð·ÐºÐ»Ð°Ð´"
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:29
-msgid "Group teachers:"
-msgstr "Ð’Ð¸ÐºÐ»Ð°Ð´Ð°Ñ‡Ñ– Ð³Ñ€ÑƒÐ¿:"
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:55
-msgid "Show regular timetable"
-msgstr "Ð’Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð·Ð¸Ñ‚Ð¸ Ð·Ð²Ð¸Ñ‡Ð°Ð¹Ð½Ð¸Ð¹ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´"
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:63
-#: aleksis/apps/chronos/templates/chronos/timetable.html:84
-msgid "View class register of this week"
-msgstr "ÐžÐ³Ð»ÑÐ´ ÐºÐ»Ð°ÑÐ½Ð¾Ð³Ð¾ Ð¶ÑƒÑ€Ð½Ð°Ð»Ñƒ Ð·Ð° Ñ†ÐµÐ¹ Ñ‚Ð¸Ð¶Ð´ÐµÐ½ÑŒ"
-
-#: aleksis/apps/chronos/templates/chronos/timetable.html:76
-msgid "Show SMART PLAN"
-msgstr "Ð’Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð·Ð¸Ñ‚Ð¸ SMART PLAN"
-
-#: aleksis/apps/chronos/templates/chronos/widget.html:8
-#, python-format
-msgid ""
-"\n"
-"        My timetable for %(day)s\n"
-"      "
-msgstr ""
-"\n"
-"        ÐœÑ–Ð¹ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´ Ð½Ð° %(day)s\n"
-"      "
-
-#: aleksis/apps/chronos/templates/chronos/widget.html:18
-msgid ""
-"\n"
-"          There is no timetable linked to your person.\n"
-"          "
+#: aleksis/apps/chronos/templates/chronos/supervision_event_description.txt:2
+msgid "Areas"
 msgstr ""
-"\n"
-"          Ð”Ð¾ Ð’Ð°ÑˆÐ¾Ñ— Ð¾ÑÐ¾Ð±Ð¸ Ð¶Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¶ÑƒÑ€Ð½Ð°Ð»Ñƒ Ð½Ðµ Ð¿Ñ€Ð¸Ð²'ÑÐ·Ð°Ð½Ð¾.\n"
-"          "
 
-#: aleksis/apps/chronos/templates/chronos/widget.html:27
-msgid "Go to smart plan"
-msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð´Ð¾ SMART PLAN"
-
-#: aleksis/apps/chronos/util/notifications.py:50
+#: aleksis/apps/chronos/util/notifications.py:48
 #, python-brace-format
-msgid ""
-"The {subject} lesson in the {period}. period on {day} has been cancelled."
+msgid "The {subject} lesson in the {period}. period on {day} has been cancelled."
 msgstr "Ð£Ñ€Ð¾Ðº {subject} Ð½Ð° {period} ÑƒÑ€Ð¾Ñ†Ñ– Ñƒ {day} ÑÐºÐ°ÑÐ¾Ð²Ð°Ð½Ð¸Ð¹."
 
-#: aleksis/apps/chronos/util/notifications.py:57
+#: aleksis/apps/chronos/util/notifications.py:55
 #, python-brace-format
-msgid ""
-"The {subject} lesson in the {period}. period on {day} has some current "
-"changes."
+msgid "The {subject} lesson in the {period}. period on {day} has some current changes."
 msgstr "Ð£Ñ€Ð¾Ðº {subject} Ð½Ð° {period} ÑƒÑ€Ð¾Ñ†Ñ– Ñƒ {day} Ð·Ð°Ñ€Ð°Ð· Ð´ÐµÑ‰Ð¾ Ð·Ð¼Ñ–Ð½ÐµÐ½Ð¸Ð¹."
 
-#: aleksis/apps/chronos/util/notifications.py:66
+#: aleksis/apps/chronos/util/notifications.py:64
 #, python-brace-format
 msgid "The teacher {old} is substituted by {new}."
 msgid_plural "The teachers {old} are substituted by {new}."
@@ -712,96 +601,189 @@ msgstr[1] "Ð’Ð¸ÐºÐ»Ð°Ð´Ð°Ñ‡Ñ– {old} Ð·Ð°Ð¼Ñ–Ð½ÐµÐ½Ñ– Ð²Ð¸ÐºÐ»Ð°Ð´Ð°Ñ‡Ð°Ð¼Ð¸ {new
 msgstr[2] "Ð’Ð¸ÐºÐ»Ð°Ð´Ð°Ñ‡Ñ– {old} Ð·Ð°Ð¼Ñ–Ð½ÐµÐ½Ñ– Ð²Ð¸ÐºÐ»Ð°Ð´Ð°Ñ‡Ð°Ð¼Ð¸ {new}."
 msgstr[3] "Ð’Ð¸ÐºÐ»Ð°Ð´Ð°Ñ‡Ñ– {old} Ð·Ð°Ð¼Ñ–Ð½ÐµÐ½Ñ– Ð²Ð¸ÐºÐ»Ð°Ð´Ð°Ñ‡Ð°Ð¼Ð¸ {new}."
 
-#: aleksis/apps/chronos/util/notifications.py:78
+#: aleksis/apps/chronos/util/notifications.py:76
 #, python-brace-format
 msgid "The subject is changed to {subject}."
 msgstr "ÐŸÑ€ÐµÐ´Ð¼ÐµÑ‚ Ð·Ð°Ð¼Ñ–Ð½ÐµÐ½Ð¸Ð¹ Ð½Ð° {subject}."
 
-#: aleksis/apps/chronos/util/notifications.py:84
+#: aleksis/apps/chronos/util/notifications.py:82
 #, python-brace-format
 msgid "The lesson is moved from {old} to {new}."
 msgstr "Ð£Ñ€Ð¾Ðº Ð¿ÐµÑ€ÐµÐ½ÐµÑÐµÐ½Ð¸Ð¹ Ð· {old} Ð´Ð¾ {new}."
 
-#: aleksis/apps/chronos/util/notifications.py:93
+#: aleksis/apps/chronos/util/notifications.py:91
 #, python-brace-format
 msgid "There is an additional comment: {comment}."
 msgstr "ÐœÐ°Ñ”Ð¼Ð¾ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¸Ð¹ ÐºÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ñ€: {comment}."
 
-#: aleksis/apps/chronos/util/notifications.py:101
+#: aleksis/apps/chronos/util/notifications.py:99
 #, python-brace-format
-msgid ""
-"There is an event that starts on {date_start}, {period_from}. period and "
-"ends on {date_end}, {period_to}. period:"
-msgstr ""
-"ÐœÐ°Ñ”Ð¼Ð¾ Ð¿Ð¾Ð´Ñ–ÑŽ, ÑÐºÐ° Ñ€Ð¾Ð·Ð¿Ð¾Ñ‡Ð¸Ð½Ð°Ñ”Ñ‚ÑŒÑÑ {date_start}, Ð½Ð° {period_from}. ÑƒÑ€Ð¾Ñ†Ñ– Ñ‚Ð° "
-"Ð·Ð°ÐºÑ–Ð½Ñ‡ÑƒÑ”Ñ‚ÑŒÑÑ {date_end}, Ð½Ð° {period_to}. ÑƒÑ€Ð¾Ñ†Ñ–:"
+msgid "There is an event that starts on {date_start}, {period_from}. period and ends on {date_end}, {period_to}. period:"
+msgstr "ÐœÐ°Ñ”Ð¼Ð¾ Ð¿Ð¾Ð´Ñ–ÑŽ, ÑÐºÐ° Ñ€Ð¾Ð·Ð¿Ð¾Ñ‡Ð¸Ð½Ð°Ñ”Ñ‚ÑŒÑÑ {date_start}, Ð½Ð° {period_from}. ÑƒÑ€Ð¾Ñ†Ñ– Ñ‚Ð° Ð·Ð°ÐºÑ–Ð½Ñ‡ÑƒÑ”Ñ‚ÑŒÑÑ {date_end}, Ð½Ð° {period_to}. ÑƒÑ€Ð¾Ñ†Ñ–:"
 
-#: aleksis/apps/chronos/util/notifications.py:114
+#: aleksis/apps/chronos/util/notifications.py:112
 #, python-brace-format
-msgid ""
-"There is an event on {date} from the {period_from}. period to the "
-"{period_to}. period:"
-msgstr ""
-"ÐœÐ°Ñ”Ð¼Ð¾ Ð¿Ð¾Ð´Ñ–ÑŽ Ð½Ð° {date} Ð· {period_from}. ÑƒÑ€Ð¾ÐºÑƒ Ð´Ð¾ ÐºÑ–Ð½Ñ†Ñ {period_to}. ÑƒÑ€Ð¾ÐºÑƒ:"
+msgid "There is an event on {date} from the {period_from}. period to the {period_to}. period:"
+msgstr "ÐœÐ°Ñ”Ð¼Ð¾ Ð¿Ð¾Ð´Ñ–ÑŽ Ð½Ð° {date} Ð· {period_from}. ÑƒÑ€Ð¾ÐºÑƒ Ð´Ð¾ ÐºÑ–Ð½Ñ†Ñ {period_to}. ÑƒÑ€Ð¾ÐºÑƒ:"
 
-#: aleksis/apps/chronos/util/notifications.py:125
-#: aleksis/apps/chronos/util/notifications.py:145
+#: aleksis/apps/chronos/util/notifications.py:123
+#: aleksis/apps/chronos/util/notifications.py:143
 #, python-brace-format
 msgid "Groups: {groups}"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¸: {groups}"
 
-#: aleksis/apps/chronos/util/notifications.py:127
-#: aleksis/apps/chronos/util/notifications.py:149
+#: aleksis/apps/chronos/util/notifications.py:125
+#: aleksis/apps/chronos/util/notifications.py:147
 #, python-brace-format
 msgid "Teachers: {teachers}"
 msgstr "Ð’Ð¸ÐºÐ»Ð°Ð´Ð°Ñ‡Ñ–: {teachers}"
 
-#: aleksis/apps/chronos/util/notifications.py:130
+#: aleksis/apps/chronos/util/notifications.py:128
 #, python-brace-format
 msgid "Rooms: {rooms}"
 msgstr "ÐšÑ–Ð¼Ð½Ð°Ñ‚Ð¸: {rooms}"
 
-#: aleksis/apps/chronos/util/notifications.py:137
+#: aleksis/apps/chronos/util/notifications.py:135
 #, python-brace-format
 msgid "There is an extra lesson on {date} in the {period}. period:"
 msgstr "ÐœÐ°Ñ”Ð¼Ð¾ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¸Ð¹ ÑƒÑ€Ð¾Ðº {date} Ð½Ð° {period}. ÑƒÑ€Ð¾Ñ†Ñ–:"
 
-#: aleksis/apps/chronos/util/notifications.py:147
+#: aleksis/apps/chronos/util/notifications.py:145
 #, python-brace-format
 msgid "Subject: {subject}"
 msgstr "ÐŸÑ€ÐµÐ´Ð¼ÐµÑ‚: {subject}"
 
-#: aleksis/apps/chronos/util/notifications.py:151
+#: aleksis/apps/chronos/util/notifications.py:149
 #, python-brace-format
 msgid "Room: {room}"
 msgstr "ÐšÑ–Ð¼Ð½Ð°Ñ‚Ð°: {room}"
 
-#: aleksis/apps/chronos/util/notifications.py:153
+#: aleksis/apps/chronos/util/notifications.py:151
 #, python-brace-format
 msgid "Comment: {comment}."
 msgstr "ÐšÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ñ€: {comment}."
 
-#: aleksis/apps/chronos/util/notifications.py:156
+#: aleksis/apps/chronos/util/notifications.py:154
 #, python-brace-format
-msgid ""
-"The supervision of {old} on {date} between the {period_from}. period and the "
-"{period_to}. period in the area {area} is substituted by {new}."
-msgstr ""
-"ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒ {old}, {date} Ð¼Ñ–Ð¶ {period_from}. Ñ‚Ð° {period_to}. ÑƒÑ€Ð¾ÐºÐ°Ð¼Ð¸ Ñƒ Ð·Ð¾Ð½Ñ– "
-"{area} Ð·Ð°Ð¼Ñ–Ð½ÐµÐ½Ð¸Ð¹ Ð½Ð° {new}."
+msgid "The supervision of {old} on {date} between the {period_from}. period and the {period_to}. period in the area {area} is substituted by {new}."
+msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒ {old}, {date} Ð¼Ñ–Ð¶ {period_from}. Ñ‚Ð° {period_to}. ÑƒÑ€Ð¾ÐºÐ°Ð¼Ð¸ Ñƒ Ð·Ð¾Ð½Ñ– {area} Ð·Ð°Ð¼Ñ–Ð½ÐµÐ½Ð¸Ð¹ Ð½Ð° {new}."
 
-#: aleksis/apps/chronos/util/notifications.py:207
+#: aleksis/apps/chronos/util/notifications.py:204
+msgid "Timetable"
+msgstr "Ð Ð¾Ð·ÐºÐ»Ð°Ð´"
+
+#: aleksis/apps/chronos/util/notifications.py:205
 msgid "There are current changes to your timetable."
 msgstr "Ð£ Ð’Ð°ÑˆÐ¾Ð¼Ñƒ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ñ– Ñ” Ð·Ð¼Ñ–Ð½Ð¸."
 
-#: aleksis/apps/chronos/views.py:270
-msgid "The substitution has been saved."
-msgstr "Ð—Ð°Ð¼Ñ–Ð½Ð° Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð°."
+#~ msgid "Options for timetables"
+#~ msgstr "ÐžÐ¿Ñ†Ñ–Ñ— Ð´Ð»Ñ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ñ–Ð²"
+
+#~ msgid "Optional data for timetables"
+#~ msgstr "Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ñ– Ð´Ð°Ð½Ñ– Ð´Ð»Ñ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ñ–Ð²"
+
+#~ msgid "My timetable"
+#~ msgstr "ÐœÑ–Ð¹ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´"
+
+#~ msgid "All timetables"
+#~ msgstr "Ð£ÑÑ– Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ð¸"
+
+#~ msgid "Daily lessons"
+#~ msgstr "Ð©Ð¾Ð´ÐµÐ½Ð½Ñ– ÑƒÑ€Ð¾ÐºÐ¸"
+
+#~ msgid "Show announcement in timetable views?"
+#~ msgstr "Ð’Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚Ð¸ Ð¾Ð³Ð¾Ð»Ð¾ÑˆÐµÐ½Ð½Ñ Ð· Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ð¾Ð¼ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ñƒ?"
+
+#~ msgid "Can view room timetable"
+#~ msgstr "ÐœÐ¾Ð¶Ðµ Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ð°Ñ‚Ð¸ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´ ÐºÑ–Ð¼Ð½Ð°Ñ‚Ð¸"
+
+#~ msgid "Timetable widget"
+#~ msgstr "Ð’Ñ–Ð´Ð¶ÐµÑ‚ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ñƒ"
 
-#: aleksis/apps/chronos/views.py:291
-msgid "The substitution has been deleted."
-msgstr "Ð—Ð°Ð¼Ñ–Ð½Ð° Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð°."
+#~ msgid "Timetable widgets"
+#~ msgstr "Ð’Ñ–Ð´Ð¶ÐµÑ‚Ð¸ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´Ñƒ"
 
-#: aleksis/apps/chronos/templates/chronos/timetable.html:84
-msgid "View class register of the current week"
-msgstr "ÐžÐ³Ð»ÑÐ´ ÐºÐ»Ð°ÑÐ½Ð¾Ð³Ð¾ Ð¶ÑƒÑ€Ð½Ð°Ð»Ñƒ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ Ñ‚Ð¸Ð¶Ð½Ñ"
+#~ msgid "Substitution"
+#~ msgstr "Ð—Ð°Ð¼Ñ–Ð½Ð°"
+
+#~ msgid "Manage substitution"
+#~ msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ð¼Ñ–Ð½Ð°Ð¼Ð¸"
+
+#~ msgid "No teachers timetables available."
+#~ msgstr "Ð Ð¾Ð·ÐºÐ»Ð°Ð´Ð¸ Ð²Ð¸ÐºÐ»Ð°Ð´Ð°Ñ‡Ñ–Ð² Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ–."
+
+#~ msgid "No group timetables available."
+#~ msgstr "Ð Ð¾Ð·ÐºÐ»Ð°Ð´Ð¸ Ð³Ñ€ÑƒÐ¿ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ–."
+
+#~ msgid "No room timetables available."
+#~ msgstr "Ð Ð¾Ð·ÐºÐ»Ð°Ð´Ð¸ ÐºÑ–Ð¼Ð½Ð°Ñ‚ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ–."
+
+#~ msgid "Edit substitution."
+#~ msgstr "Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸ Ð·Ð°Ð¼Ñ–Ð½Ñƒ."
+
+#~ msgid "Edit substitution"
+#~ msgstr "Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸ Ð·Ð°Ð¼Ñ–Ð½Ñƒ"
+
+#~ msgid "Delete"
+#~ msgstr "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸"
+
+#~ msgid "SMART PLAN"
+#~ msgstr "SMART PLAN"
+
+#~ msgid "Show week timetable for"
+#~ msgstr "Ð’Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð·Ð¸Ñ‚Ð¸ Ñ‚Ð¸Ð¶Ð½ÐµÐ²Ð¸Ð¹ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´ Ð´Ð»Ñ"
+
+#~ msgid "Cancelled due to an event"
+#~ msgstr "Ð¡ÐºÐ°ÑÐ¾Ð²Ð°Ð½Ð¾ Ñ‡ÐµÑ€ÐµÐ· Ð¿Ð¾Ð´Ñ–ÑŽ"
+
+#~ msgid "Cancelled for teachers"
+#~ msgstr "Ð¡ÐºÐ°ÑÐ¾Ð²Ð°Ð½Ð¾ Ð´Ð»Ñ Ð²Ð¸ÐºÐ»Ð°Ð´Ð°Ñ‡Ñ–Ð²"
+
+#~ msgid "Today"
+#~ msgstr "Ð¡ÑŒÐ¾Ð³Ð¾Ð´Ð½Ñ–"
+
+#~ msgid "CW"
+#~ msgstr "Ð¢Ð–"
+
+#~ msgid "Group teachers:"
+#~ msgstr "Ð’Ð¸ÐºÐ»Ð°Ð´Ð°Ñ‡Ñ– Ð³Ñ€ÑƒÐ¿:"
+
+#~ msgid "Show regular timetable"
+#~ msgstr "Ð’Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð·Ð¸Ñ‚Ð¸ Ð·Ð²Ð¸Ñ‡Ð°Ð¹Ð½Ð¸Ð¹ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´"
+
+#~ msgid "View class register of this week"
+#~ msgstr "ÐžÐ³Ð»ÑÐ´ ÐºÐ»Ð°ÑÐ½Ð¾Ð³Ð¾ Ð¶ÑƒÑ€Ð½Ð°Ð»Ñƒ Ð·Ð° Ñ†ÐµÐ¹ Ñ‚Ð¸Ð¶Ð´ÐµÐ½ÑŒ"
+
+#~ msgid "Show SMART PLAN"
+#~ msgstr "Ð’Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð·Ð¸Ñ‚Ð¸ SMART PLAN"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "        My timetable for %(day)s\n"
+#~ "      "
+#~ msgstr ""
+#~ "\n"
+#~ "        ÐœÑ–Ð¹ Ñ€Ð¾Ð·ÐºÐ»Ð°Ð´ Ð½Ð° %(day)s\n"
+#~ "      "
+
+#~ msgid ""
+#~ "\n"
+#~ "          There is no timetable linked to your person.\n"
+#~ "          "
+#~ msgstr ""
+#~ "\n"
+#~ "          Ð”Ð¾ Ð’Ð°ÑˆÐ¾Ñ— Ð¾ÑÐ¾Ð±Ð¸ Ð¶Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¶ÑƒÑ€Ð½Ð°Ð»Ñƒ Ð½Ðµ Ð¿Ñ€Ð¸Ð²'ÑÐ·Ð°Ð½Ð¾.\n"
+#~ "          "
+
+#~ msgid "Go to smart plan"
+#~ msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð´Ð¾ SMART PLAN"
+
+#~ msgid "The substitution has been saved."
+#~ msgstr "Ð—Ð°Ð¼Ñ–Ð½Ð° Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð°."
+
+#~ msgid "The substitution has been deleted."
+#~ msgstr "Ð—Ð°Ð¼Ñ–Ð½Ð° Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð°."
+
+#~ msgid "View class register of the current week"
+#~ msgstr "ÐžÐ³Ð»ÑÐ´ ÐºÐ»Ð°ÑÐ½Ð¾Ð³Ð¾ Ð¶ÑƒÑ€Ð½Ð°Ð»Ñƒ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ Ñ‚Ð¸Ð¶Ð½Ñ"