diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index 7fcf6e217..359fbebd0 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2022.12-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-07 11:21+0100\n"
+"POT-Creation-Date: 2022-11-07 19:28+0000\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,75 +18,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 
-#: mod/cal.php:44 mod/cal.php:48 mod/redir.php:35 mod/redir.php:176
-#: src/Module/Contact/Follow.php:69 src/Module/Conversation/Community.php:193
-#: src/Module/Debug/ItemBody.php:38 src/Module/Diaspora/Receive.php:57
-#: src/Module/Item/Follow.php:41 src/Module/Item/Ignore.php:41
-#: src/Module/Item/Pin.php:41 src/Module/Item/Pin.php:56
-#: src/Module/Item/Star.php:42
-msgid "Access denied."
-msgstr ""
-
-#: mod/cal.php:61 mod/cal.php:78 mod/photos.php:68 mod/photos.php:139
-#: mod/photos.php:793 src/Model/Profile.php:234
-#: src/Module/Calendar/Export.php:63 src/Module/Feed.php:72
-#: src/Module/HCard.php:51 src/Module/Profile/Common.php:40
-#: src/Module/Profile/Common.php:51 src/Module/Profile/Contacts.php:39
-#: src/Module/Profile/Contacts.php:49 src/Module/Profile/Media.php:38
-#: src/Module/Profile/Photos/Upload.php:87
-#: src/Module/Profile/RemoteFollow.php:71 src/Module/Profile/Status.php:58
-#: src/Module/Register.php:267
-msgid "User not found."
-msgstr ""
-
-#: mod/cal.php:113 mod/display.php:259 src/Module/Profile/Profile.php:93
-#: src/Module/Profile/Profile.php:108 src/Module/Profile/Status.php:109
-#: src/Module/Update/Profile.php:55
-msgid "Access to this profile has been restricted."
-msgstr ""
-
-#: mod/cal.php:234 mod/events.php:375 src/Content/Nav.php:196
-#: src/Content/Nav.php:260 src/Module/BaseProfile.php:84
-#: src/Module/BaseProfile.php:95 view/theme/frio/theme.php:241
-#: view/theme/frio/theme.php:245
-msgid "Events"
-msgstr ""
-
-#: mod/cal.php:235 mod/events.php:376
-msgid "View"
-msgstr ""
-
-#: mod/cal.php:236 mod/events.php:378
-msgid "Previous"
-msgstr ""
-
-#: mod/cal.php:237 mod/events.php:379 src/Module/Install.php:214
-msgid "Next"
-msgstr ""
-
-#: mod/cal.php:240 mod/events.php:384 src/Model/Event.php:460
-msgid "today"
-msgstr ""
-
-#: mod/cal.php:241 mod/events.php:385 src/Model/Event.php:461
-#: src/Util/Temporal.php:341
-msgid "month"
-msgstr ""
-
-#: mod/cal.php:242 mod/events.php:386 src/Model/Event.php:462
-#: src/Util/Temporal.php:342
-msgid "week"
-msgstr ""
-
-#: mod/cal.php:243 mod/events.php:387 src/Model/Event.php:463
-#: src/Util/Temporal.php:343
-msgid "day"
-msgstr ""
-
-#: mod/cal.php:244 mod/events.php:388
-msgid "list"
-msgstr ""
-
 #: mod/display.php:140 mod/photos.php:797
 #: src/Module/Conversation/Community.php:187 src/Module/Directory.php:48
 #: src/Module/Search/Index.php:64
@@ -97,23 +28,31 @@ msgstr ""
 msgid "The requested item doesn't exist or has been deleted."
 msgstr ""
 
+#: mod/display.php:259 src/Model/Event.php:525
+#: src/Module/Profile/Profile.php:93 src/Module/Profile/Profile.php:108
+#: src/Module/Profile/Status.php:109 src/Module/Update/Profile.php:55
+msgid "Access to this profile has been restricted."
+msgstr ""
+
 #: mod/display.php:364
 msgid "The feed for this item is unavailable."
 msgstr ""
 
-#: mod/editpost.php:38 mod/events.php:218 mod/item.php:181 mod/item.php:186
-#: mod/item.php:870 mod/message.php:69 mod/message.php:114 mod/notes.php:44
+#: mod/editpost.php:38 mod/item.php:181 mod/item.php:186 mod/item.php:870
+#: mod/message.php:69 mod/message.php:114 mod/notes.php:44
 #: mod/ostatus_subscribe.php:33 mod/photos.php:159 mod/photos.php:886
 #: mod/repair_ostatus.php:31 mod/settings.php:40 mod/settings.php:50
 #: mod/settings.php:156 src/Module/Attach.php:56 src/Module/BaseApi.php:94
-#: src/Module/BaseNotifications.php:98 src/Module/Contact/Advanced.php:60
-#: src/Module/Contact/Follow.php:86 src/Module/Contact/Follow.php:158
-#: src/Module/Contact/Suggestions.php:54 src/Module/Contact/Unfollow.php:66
-#: src/Module/Contact/Unfollow.php:80 src/Module/Contact/Unfollow.php:112
-#: src/Module/Delegation.php:118 src/Module/FollowConfirm.php:38
-#: src/Module/FriendSuggest.php:57 src/Module/Group.php:40
-#: src/Module/Group.php:83 src/Module/Invite.php:42 src/Module/Invite.php:131
-#: src/Module/Notifications/Notification.php:76
+#: src/Module/BaseNotifications.php:98 src/Module/Calendar/Event/API.php:88
+#: src/Module/Calendar/Event/Form.php:84 src/Module/Calendar/Event/Show.php:54
+#: src/Module/Calendar/Export.php:62 src/Module/Calendar/Show.php:64
+#: src/Module/Contact/Advanced.php:60 src/Module/Contact/Follow.php:86
+#: src/Module/Contact/Follow.php:158 src/Module/Contact/Suggestions.php:54
+#: src/Module/Contact/Unfollow.php:66 src/Module/Contact/Unfollow.php:80
+#: src/Module/Contact/Unfollow.php:112 src/Module/Delegation.php:118
+#: src/Module/FollowConfirm.php:38 src/Module/FriendSuggest.php:57
+#: src/Module/Group.php:40 src/Module/Group.php:83 src/Module/Invite.php:42
+#: src/Module/Invite.php:131 src/Module/Notifications/Notification.php:76
 #: src/Module/Notifications/Notification.php:107
 #: src/Module/Profile/Attachment/Upload.php:97 src/Module/Profile/Common.php:55
 #: src/Module/Profile/Contacts.php:55 src/Module/Profile/Photos/Upload.php:108
@@ -245,9 +184,10 @@ msgstr ""
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: mod/editpost.php:128 mod/events.php:514 mod/photos.php:1334
-#: mod/photos.php:1390 mod/photos.php:1464 src/Content/Conversation.php:386
-#: src/Module/Item/Compose.php:199 src/Object/Post.php:997
+#: mod/editpost.php:128 mod/photos.php:1334 mod/photos.php:1390
+#: mod/photos.php:1464 src/Content/Conversation.php:386
+#: src/Module/Calendar/Event/Form.php:247 src/Module/Item/Compose.php:199
+#: src/Object/Post.php:997
 msgid "Preview"
 msgstr ""
 
@@ -306,8 +246,8 @@ msgstr ""
 msgid "Browser"
 msgstr ""
 
-#: mod/editpost.php:145 mod/events.php:519 mod/photos.php:934
-#: mod/photos.php:1288 src/Content/Conversation.php:373
+#: mod/editpost.php:145 mod/photos.php:934 mod/photos.php:1288
+#: src/Content/Conversation.php:373 src/Module/Calendar/Event/Form.php:252
 msgid "Permissions"
 msgstr ""
 
@@ -315,112 +255,6 @@ msgstr ""
 msgid "Open Compose page"
 msgstr ""
 
-#: mod/events.php:124 mod/events.php:126
-msgid "Event can not end before it has started."
-msgstr ""
-
-#: mod/events.php:132 mod/events.php:134
-msgid "Event title and start time are required."
-msgstr ""
-
-#: mod/events.php:377
-msgid "Create New Event"
-msgstr ""
-
-#: mod/events.php:475 src/Module/Admin/Logs/View.php:97
-msgid "Event details"
-msgstr ""
-
-#: mod/events.php:476
-msgid "Starting date and Title are required."
-msgstr ""
-
-#: mod/events.php:477 mod/events.php:482
-msgid "Event Starts:"
-msgstr ""
-
-#: mod/events.php:477 mod/events.php:507
-#: src/Module/Admin/Blocklist/Server/Add.php:136
-#: src/Module/Admin/Blocklist/Server/Add.php:138
-#: src/Module/Admin/Blocklist/Server/Import.php:128
-#: src/Module/Admin/Blocklist/Server/Index.php:82
-#: src/Module/Admin/Blocklist/Server/Index.php:83
-#: src/Module/Admin/Blocklist/Server/Index.php:111
-#: src/Module/Admin/Blocklist/Server/Index.php:112
-#: src/Module/Admin/Item/Delete.php:69 src/Module/Debug/Probe.php:59
-#: src/Module/Install.php:207 src/Module/Install.php:240
-#: src/Module/Install.php:245 src/Module/Install.php:264
-#: src/Module/Install.php:275 src/Module/Install.php:280
-#: src/Module/Install.php:286 src/Module/Install.php:291
-#: src/Module/Install.php:305 src/Module/Install.php:320
-#: src/Module/Install.php:347 src/Module/Register.php:148
-#: src/Module/Security/TwoFactor/Verify.php:101
-#: src/Module/Settings/TwoFactor/Index.php:140
-#: src/Module/Settings/TwoFactor/Verify.php:154
-msgid "Required"
-msgstr ""
-
-#: mod/events.php:490 mod/events.php:513
-msgid "Finish date/time is not known or not relevant"
-msgstr ""
-
-#: mod/events.php:492 mod/events.php:497
-msgid "Event Finishes:"
-msgstr ""
-
-#: mod/events.php:503 src/Module/Profile/Profile.php:171
-#: src/Module/Settings/Profile/Index.php:247
-msgid "Description:"
-msgstr ""
-
-#: mod/events.php:505 src/Content/Widget/VCard.php:104 src/Model/Event.php:80
-#: src/Model/Event.php:107 src/Model/Event.php:469 src/Model/Event.php:918
-#: src/Model/Profile.php:373 src/Module/Contact/Profile.php:370
-#: src/Module/Directory.php:147 src/Module/Notifications/Introductions.php:187
-#: src/Module/Profile/Profile.php:193
-msgid "Location:"
-msgstr ""
-
-#: mod/events.php:507 mod/events.php:509
-msgid "Title:"
-msgstr ""
-
-#: mod/events.php:510 mod/events.php:511
-msgid "Share this event"
-msgstr ""
-
-#: mod/events.php:516 mod/message.php:204 mod/message.php:359
-#: mod/photos.php:916 mod/photos.php:1020 mod/photos.php:1292
-#: mod/photos.php:1333 mod/photos.php:1389 mod/photos.php:1463
-#: src/Module/Admin/Item/Source.php:60 src/Module/Contact/Advanced.php:132
-#: src/Module/Contact/Profile.php:328
-#: src/Module/Debug/ActivityPubConversion.php:140
-#: src/Module/Debug/Babel.php:313 src/Module/Debug/Localtime.php:64
-#: src/Module/Debug/Probe.php:54 src/Module/Debug/WebFinger.php:51
-#: src/Module/Delegation.php:147 src/Module/FriendSuggest.php:145
-#: src/Module/Install.php:252 src/Module/Install.php:294
-#: src/Module/Install.php:331 src/Module/Invite.php:178
-#: src/Module/Item/Compose.php:189 src/Module/Profile/Profile.php:246
-#: src/Module/Profile/UnkMail.php:156 src/Module/Settings/Profile/Index.php:231
-#: src/Object/Post.php:986 view/theme/duepuntozero/config.php:85
-#: view/theme/frio/config.php:171 view/theme/quattro/config.php:87
-#: view/theme/vier/config.php:135
-msgid "Submit"
-msgstr ""
-
-#: mod/events.php:517 src/Module/Profile/Profile.php:247
-msgid "Basic"
-msgstr ""
-
-#: mod/events.php:518 src/Module/Admin/Site.php:439 src/Module/Contact.php:477
-#: src/Module/Profile/Profile.php:248
-msgid "Advanced"
-msgstr ""
-
-#: mod/events.php:535
-msgid "Failed to remove event"
-msgstr ""
-
 #: mod/fbrowser.php:61 src/Content/Nav.php:194 src/Module/BaseProfile.php:64
 #: view/theme/frio/theme.php:239
 msgid "Photos"
@@ -673,6 +507,25 @@ msgstr ""
 msgid "Your message:"
 msgstr ""
 
+#: mod/message.php:204 mod/message.php:359 mod/photos.php:916
+#: mod/photos.php:1020 mod/photos.php:1292 mod/photos.php:1333
+#: mod/photos.php:1389 mod/photos.php:1463 src/Module/Admin/Item/Source.php:60
+#: src/Module/Calendar/Event/Form.php:249 src/Module/Contact/Advanced.php:132
+#: src/Module/Contact/Profile.php:328
+#: src/Module/Debug/ActivityPubConversion.php:140
+#: src/Module/Debug/Babel.php:313 src/Module/Debug/Localtime.php:64
+#: src/Module/Debug/Probe.php:54 src/Module/Debug/WebFinger.php:51
+#: src/Module/Delegation.php:147 src/Module/FriendSuggest.php:145
+#: src/Module/Install.php:252 src/Module/Install.php:294
+#: src/Module/Install.php:331 src/Module/Invite.php:178
+#: src/Module/Item/Compose.php:189 src/Module/Profile/Profile.php:246
+#: src/Module/Profile/UnkMail.php:156 src/Module/Settings/Profile/Index.php:231
+#: src/Object/Post.php:986 view/theme/duepuntozero/config.php:85
+#: view/theme/frio/config.php:171 view/theme/quattro/config.php:87
+#: view/theme/vier/config.php:135
+msgid "Submit"
+msgstr ""
+
 #: mod/message.php:225
 msgid "No messages."
 msgstr ""
@@ -781,6 +634,18 @@ msgstr ""
 msgid "Keep this window open until done."
 msgstr ""
 
+#: mod/photos.php:68 mod/photos.php:139 mod/photos.php:793
+#: src/Model/Event.php:514 src/Model/Profile.php:234
+#: src/Module/Calendar/Export.php:67 src/Module/Feed.php:72
+#: src/Module/HCard.php:51 src/Module/Profile/Common.php:40
+#: src/Module/Profile/Common.php:51 src/Module/Profile/Contacts.php:39
+#: src/Module/Profile/Contacts.php:49 src/Module/Profile/Media.php:38
+#: src/Module/Profile/Photos/Upload.php:87
+#: src/Module/Profile/RemoteFollow.php:71 src/Module/Profile/Status.php:58
+#: src/Module/Register.php:267
+msgid "User not found."
+msgstr ""
+
 #: mod/photos.php:107 src/Module/BaseProfile.php:67
 msgid "Photo Albums"
 msgstr ""
@@ -1035,6 +900,14 @@ msgstr ""
 msgid "View Album"
 msgstr ""
 
+#: mod/redir.php:35 mod/redir.php:176 src/Module/Contact/Follow.php:69
+#: src/Module/Conversation/Community.php:193 src/Module/Debug/ItemBody.php:38
+#: src/Module/Diaspora/Receive.php:57 src/Module/Item/Follow.php:41
+#: src/Module/Item/Ignore.php:41 src/Module/Item/Pin.php:41
+#: src/Module/Item/Pin.php:56 src/Module/Item/Star.php:42
+msgid "Access denied."
+msgstr ""
+
 #: mod/redir.php:50 mod/redir.php:103
 msgid "Bad Request."
 msgstr ""
@@ -2218,8 +2091,16 @@ msgstr ""
 msgid "Your postings with media"
 msgstr ""
 
+#: src/Content/Nav.php:196 src/Content/Nav.php:260
+#: src/Module/BaseProfile.php:84 src/Module/BaseProfile.php:87
+#: src/Module/BaseProfile.php:95 src/Module/BaseProfile.php:98
+#: src/Module/Settings/Display.php:205 view/theme/frio/theme.php:241
+#: view/theme/frio/theme.php:245
+msgid "Calendar"
+msgstr ""
+
 #: src/Content/Nav.php:196 view/theme/frio/theme.php:241
-msgid "Your events"
+msgid "Your calendar"
 msgstr ""
 
 #: src/Content/Nav.php:197
@@ -2296,11 +2177,6 @@ msgstr ""
 msgid "Conversations on this and other servers"
 msgstr ""
 
-#: src/Content/Nav.php:260 src/Module/BaseProfile.php:87
-#: src/Module/BaseProfile.php:98 view/theme/frio/theme.php:245
-msgid "Events and Calendar"
-msgstr ""
-
 #: src/Content/Nav.php:263
 msgid "Directory"
 msgstr ""
@@ -2670,6 +2546,15 @@ msgstr ""
 msgid "Matrix:"
 msgstr ""
 
+#: src/Content/Widget/VCard.php:104 src/Model/Event.php:82
+#: src/Model/Event.php:109 src/Model/Event.php:471 src/Model/Event.php:992
+#: src/Model/Profile.php:373 src/Module/Calendar/Event/Form.php:238
+#: src/Module/Contact/Profile.php:370 src/Module/Directory.php:147
+#: src/Module/Notifications/Introductions.php:187
+#: src/Module/Profile/Profile.php:193
+msgid "Location:"
+msgstr ""
+
 #: src/Content/Widget/VCard.php:107 src/Model/Profile.php:471
 #: src/Module/Notifications/Introductions.php:201
 msgid "Network:"
@@ -3046,142 +2931,142 @@ msgstr ""
 msgid "Could not connect to database."
 msgstr ""
 
-#: src/Core/L10n.php:403 src/Model/Event.php:428
+#: src/Core/L10n.php:403 src/Model/Event.php:430
 #: src/Module/Settings/Display.php:183
 msgid "Monday"
 msgstr ""
 
-#: src/Core/L10n.php:403 src/Model/Event.php:429
+#: src/Core/L10n.php:403 src/Model/Event.php:431
 #: src/Module/Settings/Display.php:184
 msgid "Tuesday"
 msgstr ""
 
-#: src/Core/L10n.php:403 src/Model/Event.php:430
+#: src/Core/L10n.php:403 src/Model/Event.php:432
 #: src/Module/Settings/Display.php:185
 msgid "Wednesday"
 msgstr ""
 
-#: src/Core/L10n.php:403 src/Model/Event.php:431
+#: src/Core/L10n.php:403 src/Model/Event.php:433
 #: src/Module/Settings/Display.php:186
 msgid "Thursday"
 msgstr ""
 
-#: src/Core/L10n.php:403 src/Model/Event.php:432
+#: src/Core/L10n.php:403 src/Model/Event.php:434
 #: src/Module/Settings/Display.php:187
 msgid "Friday"
 msgstr ""
 
-#: src/Core/L10n.php:403 src/Model/Event.php:433
+#: src/Core/L10n.php:403 src/Model/Event.php:435
 #: src/Module/Settings/Display.php:188
 msgid "Saturday"
 msgstr ""
 
-#: src/Core/L10n.php:403 src/Model/Event.php:427
+#: src/Core/L10n.php:403 src/Model/Event.php:429
 #: src/Module/Settings/Display.php:182
 msgid "Sunday"
 msgstr ""
 
-#: src/Core/L10n.php:407 src/Model/Event.php:448
+#: src/Core/L10n.php:407 src/Model/Event.php:450
 msgid "January"
 msgstr ""
 
-#: src/Core/L10n.php:407 src/Model/Event.php:449
+#: src/Core/L10n.php:407 src/Model/Event.php:451
 msgid "February"
 msgstr ""
 
-#: src/Core/L10n.php:407 src/Model/Event.php:450
+#: src/Core/L10n.php:407 src/Model/Event.php:452
 msgid "March"
 msgstr ""
 
-#: src/Core/L10n.php:407 src/Model/Event.php:451
+#: src/Core/L10n.php:407 src/Model/Event.php:453
 msgid "April"
 msgstr ""
 
-#: src/Core/L10n.php:407 src/Core/L10n.php:426 src/Model/Event.php:439
+#: src/Core/L10n.php:407 src/Core/L10n.php:426 src/Model/Event.php:441
 msgid "May"
 msgstr ""
 
-#: src/Core/L10n.php:407 src/Model/Event.php:452
+#: src/Core/L10n.php:407 src/Model/Event.php:454
 msgid "June"
 msgstr ""
 
-#: src/Core/L10n.php:407 src/Model/Event.php:453
+#: src/Core/L10n.php:407 src/Model/Event.php:455
 msgid "July"
 msgstr ""
 
-#: src/Core/L10n.php:407 src/Model/Event.php:454
+#: src/Core/L10n.php:407 src/Model/Event.php:456
 msgid "August"
 msgstr ""
 
-#: src/Core/L10n.php:407 src/Model/Event.php:455
+#: src/Core/L10n.php:407 src/Model/Event.php:457
 msgid "September"
 msgstr ""
 
-#: src/Core/L10n.php:407 src/Model/Event.php:456
+#: src/Core/L10n.php:407 src/Model/Event.php:458
 msgid "October"
 msgstr ""
 
-#: src/Core/L10n.php:407 src/Model/Event.php:457
+#: src/Core/L10n.php:407 src/Model/Event.php:459
 msgid "November"
 msgstr ""
 
-#: src/Core/L10n.php:407 src/Model/Event.php:458
+#: src/Core/L10n.php:407 src/Model/Event.php:460
 msgid "December"
 msgstr ""
 
-#: src/Core/L10n.php:422 src/Model/Event.php:420
+#: src/Core/L10n.php:422 src/Model/Event.php:422
 msgid "Mon"
 msgstr ""
 
-#: src/Core/L10n.php:422 src/Model/Event.php:421
+#: src/Core/L10n.php:422 src/Model/Event.php:423
 msgid "Tue"
 msgstr ""
 
-#: src/Core/L10n.php:422 src/Model/Event.php:422
+#: src/Core/L10n.php:422 src/Model/Event.php:424
 msgid "Wed"
 msgstr ""
 
-#: src/Core/L10n.php:422 src/Model/Event.php:423
+#: src/Core/L10n.php:422 src/Model/Event.php:425
 msgid "Thu"
 msgstr ""
 
-#: src/Core/L10n.php:422 src/Model/Event.php:424
+#: src/Core/L10n.php:422 src/Model/Event.php:426
 msgid "Fri"
 msgstr ""
 
-#: src/Core/L10n.php:422 src/Model/Event.php:425
+#: src/Core/L10n.php:422 src/Model/Event.php:427
 msgid "Sat"
 msgstr ""
 
-#: src/Core/L10n.php:422 src/Model/Event.php:419
+#: src/Core/L10n.php:422 src/Model/Event.php:421
 msgid "Sun"
 msgstr ""
 
-#: src/Core/L10n.php:426 src/Model/Event.php:435
+#: src/Core/L10n.php:426 src/Model/Event.php:437
 msgid "Jan"
 msgstr ""
 
-#: src/Core/L10n.php:426 src/Model/Event.php:436
+#: src/Core/L10n.php:426 src/Model/Event.php:438
 msgid "Feb"
 msgstr ""
 
-#: src/Core/L10n.php:426 src/Model/Event.php:437
+#: src/Core/L10n.php:426 src/Model/Event.php:439
 msgid "Mar"
 msgstr ""
 
-#: src/Core/L10n.php:426 src/Model/Event.php:438
+#: src/Core/L10n.php:426 src/Model/Event.php:440
 msgid "Apr"
 msgstr ""
 
-#: src/Core/L10n.php:426 src/Model/Event.php:440
+#: src/Core/L10n.php:426 src/Model/Event.php:442
 msgid "Jun"
 msgstr ""
 
-#: src/Core/L10n.php:426 src/Model/Event.php:441
+#: src/Core/L10n.php:426 src/Model/Event.php:443
 msgid "Jul"
 msgstr ""
 
-#: src/Core/L10n.php:426 src/Model/Event.php:442
+#: src/Core/L10n.php:426 src/Model/Event.php:444
 msgid "Aug"
 msgstr ""
 
@@ -3189,15 +3074,15 @@ msgstr ""
 msgid "Sep"
 msgstr ""
 
-#: src/Core/L10n.php:426 src/Model/Event.php:444
+#: src/Core/L10n.php:426 src/Model/Event.php:446
 msgid "Oct"
 msgstr ""
 
-#: src/Core/L10n.php:426 src/Model/Event.php:445
+#: src/Core/L10n.php:426 src/Model/Event.php:447
 msgid "Nov"
 msgstr ""
 
-#: src/Core/L10n.php:426 src/Model/Event.php:446
+#: src/Core/L10n.php:426 src/Model/Event.php:448
 msgid "Dec"
 msgstr ""
 
@@ -3439,74 +3324,97 @@ msgstr ""
 msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: src/Model/Event.php:52
+#: src/Model/Event.php:54
 msgid "l F d, Y \\@ g:i A \\G\\M\\TP (e)"
 msgstr ""
 
-#: src/Model/Event.php:73 src/Model/Event.php:90 src/Model/Event.php:467
-#: src/Model/Event.php:900
+#: src/Model/Event.php:75 src/Model/Event.php:92 src/Model/Event.php:469
+#: src/Model/Event.php:974
 msgid "Starts:"
 msgstr ""
 
-#: src/Model/Event.php:76 src/Model/Event.php:96 src/Model/Event.php:468
-#: src/Model/Event.php:904
+#: src/Model/Event.php:78 src/Model/Event.php:98 src/Model/Event.php:470
+#: src/Model/Event.php:978
 msgid "Finishes:"
 msgstr ""
 
-#: src/Model/Event.php:417
+#: src/Model/Event.php:419
 msgid "all-day"
 msgstr ""
 
-#: src/Model/Event.php:443
+#: src/Model/Event.php:445
 msgid "Sept"
 msgstr ""
 
-#: src/Model/Event.php:465
+#: src/Model/Event.php:462 src/Module/Calendar/Show.php:124
+msgid "today"
+msgstr ""
+
+#: src/Model/Event.php:463 src/Module/Calendar/Show.php:125
+#: src/Util/Temporal.php:341
+msgid "month"
+msgstr ""
+
+#: src/Model/Event.php:464 src/Module/Calendar/Show.php:126
+#: src/Util/Temporal.php:342
+msgid "week"
+msgstr ""
+
+#: src/Model/Event.php:465 src/Module/Calendar/Show.php:127
+#: src/Util/Temporal.php:343
+msgid "day"
+msgstr ""
+
+#: src/Model/Event.php:467
 msgid "No events to display"
 msgstr ""
 
-#: src/Model/Event.php:581
+#: src/Model/Event.php:567 src/Module/Calendar/Event/Show.php:64
+msgid "Event not found."
+msgstr ""
+
+#: src/Model/Event.php:662
 msgid "l, F j"
 msgstr ""
 
-#: src/Model/Event.php:612
+#: src/Model/Event.php:689
 msgid "Edit event"
 msgstr ""
 
-#: src/Model/Event.php:613
+#: src/Model/Event.php:690
 msgid "Duplicate event"
 msgstr ""
 
-#: src/Model/Event.php:614
+#: src/Model/Event.php:691
 msgid "Delete event"
 msgstr ""
 
-#: src/Model/Event.php:856 src/Module/Debug/Localtime.php:38
+#: src/Model/Event.php:930 src/Module/Debug/Localtime.php:38
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: src/Model/Event.php:857
+#: src/Model/Event.php:931
 msgid "D g:i A"
 msgstr ""
 
-#: src/Model/Event.php:858
+#: src/Model/Event.php:932
 msgid "g:i A"
 msgstr ""
 
-#: src/Model/Event.php:919 src/Model/Event.php:921
+#: src/Model/Event.php:993 src/Model/Event.php:995
 msgid "Show map"
 msgstr ""
 
-#: src/Model/Event.php:920
+#: src/Model/Event.php:994
 msgid "Hide map"
 msgstr ""
 
-#: src/Model/Event.php:1013
+#: src/Model/Event.php:1087
 #, php-format
 msgid "%s's birthday"
 msgstr ""
 
-#: src/Model/Event.php:1014
+#: src/Model/Event.php:1088
 #, php-format
 msgid "Happy Birthday %s"
 msgstr ""
@@ -4354,6 +4262,27 @@ msgid ""
 "the protocol."
 msgstr ""
 
+#: src/Module/Admin/Blocklist/Server/Add.php:136
+#: src/Module/Admin/Blocklist/Server/Add.php:138
+#: src/Module/Admin/Blocklist/Server/Import.php:128
+#: src/Module/Admin/Blocklist/Server/Index.php:82
+#: src/Module/Admin/Blocklist/Server/Index.php:83
+#: src/Module/Admin/Blocklist/Server/Index.php:111
+#: src/Module/Admin/Blocklist/Server/Index.php:112
+#: src/Module/Admin/Item/Delete.php:69 src/Module/Calendar/Event/Form.php:208
+#: src/Module/Calendar/Event/Form.php:240 src/Module/Debug/Probe.php:59
+#: src/Module/Install.php:207 src/Module/Install.php:240
+#: src/Module/Install.php:245 src/Module/Install.php:264
+#: src/Module/Install.php:275 src/Module/Install.php:280
+#: src/Module/Install.php:286 src/Module/Install.php:291
+#: src/Module/Install.php:305 src/Module/Install.php:320
+#: src/Module/Install.php:347 src/Module/Register.php:148
+#: src/Module/Security/TwoFactor/Verify.php:101
+#: src/Module/Settings/TwoFactor/Index.php:140
+#: src/Module/Settings/TwoFactor/Verify.php:154
+msgid "Required"
+msgstr ""
+
 #: src/Module/Admin/Blocklist/Server/Add.php:137
 msgid "Purge server"
 msgstr ""
@@ -4852,6 +4781,10 @@ msgstr ""
 msgid "Click to view details"
 msgstr ""
 
+#: src/Module/Admin/Logs/View.php:97 src/Module/Calendar/Event/Form.php:206
+msgid "Event details"
+msgstr ""
+
 #: src/Module/Admin/Logs/View.php:98
 msgid "Data"
 msgstr ""
@@ -5026,6 +4959,11 @@ msgstr ""
 msgid "Policies"
 msgstr ""
 
+#: src/Module/Admin/Site.php:439 src/Module/Calendar/Event/Form.php:251
+#: src/Module/Contact.php:477 src/Module/Profile/Profile.php:248
+msgid "Advanced"
+msgstr ""
+
 #: src/Module/Admin/Site.php:440
 msgid "Auto Discovered Contact Directory"
 msgstr ""
@@ -6583,18 +6521,93 @@ msgstr ""
 msgid "The post was created"
 msgstr ""
 
-#: src/Module/Calendar/Export.php:73
+#: src/Module/Calendar/Event/API.php:100 src/Module/Calendar/Event/API.php:135
+#: src/Module/Calendar/Event/Form.php:80 src/Module/Calendar/Event/Show.php:58
+msgid "Invalid Request"
+msgstr ""
+
+#: src/Module/Calendar/Event/API.php:109
+msgid "Event id is missing."
+msgstr ""
+
+#: src/Module/Calendar/Event/API.php:131
+msgid "Failed to remove event"
+msgstr ""
+
+#: src/Module/Calendar/Event/API.php:186 src/Module/Calendar/Event/API.php:188
+msgid "Event can not end before it has started."
+msgstr ""
+
+#: src/Module/Calendar/Event/API.php:195 src/Module/Calendar/Event/API.php:197
+msgid "Event title and start time are required."
+msgstr ""
+
+#: src/Module/Calendar/Event/Form.php:207
+msgid "Starting date and Title are required."
+msgstr ""
+
+#: src/Module/Calendar/Event/Form.php:208
+#: src/Module/Calendar/Event/Form.php:213
+msgid "Event Starts:"
+msgstr ""
+
+#: src/Module/Calendar/Event/Form.php:222
+#: src/Module/Calendar/Event/Form.php:246
+msgid "Finish date/time is not known or not relevant"
+msgstr ""
+
+#: src/Module/Calendar/Event/Form.php:224
+#: src/Module/Calendar/Event/Form.php:229
+msgid "Event Finishes:"
+msgstr ""
+
+#: src/Module/Calendar/Event/Form.php:236 src/Module/Profile/Profile.php:171
+#: src/Module/Settings/Profile/Index.php:247
+msgid "Description:"
+msgstr ""
+
+#: src/Module/Calendar/Event/Form.php:240
+#: src/Module/Calendar/Event/Form.php:242
+msgid "Title:"
+msgstr ""
+
+#: src/Module/Calendar/Event/Form.php:243
+#: src/Module/Calendar/Event/Form.php:244
+msgid "Share this event"
+msgstr ""
+
+#: src/Module/Calendar/Event/Form.php:250 src/Module/Profile/Profile.php:247
+msgid "Basic"
+msgstr ""
+
+#: src/Module/Calendar/Export.php:77
 msgid "This calendar format is not supported"
 msgstr ""
 
-#: src/Module/Calendar/Export.php:75
+#: src/Module/Calendar/Export.php:79
 msgid "No exportable data found"
 msgstr ""
 
-#: src/Module/Calendar/Export.php:92
+#: src/Module/Calendar/Export.php:96
 msgid "calendar"
 msgstr ""
 
+#: src/Module/Calendar/Show.php:120
+msgid "Events"
+msgstr ""
+
+#: src/Module/Calendar/Show.php:121
+msgid "View"
+msgstr ""
+
+#: src/Module/Calendar/Show.php:122
+msgid "Create New Event"
+msgstr ""
+
+#: src/Module/Calendar/Show.php:128
+msgid "list"
+msgstr ""
+
 #: src/Module/Contact.php:88
 #, php-format
 msgid "%d contact edited."
@@ -7724,6 +7737,10 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#: src/Module/Install.php:214
+msgid "Next"
+msgstr ""
+
 #: src/Module/Install.php:215
 msgid "Check again"
 msgstr ""
@@ -9419,10 +9436,6 @@ msgstr ""
 msgid "Theme settings"
 msgstr ""
 
-#: src/Module/Settings/Display.php:205
-msgid "Calendar"
-msgstr ""
-
 #: src/Module/Settings/Display.php:211
 msgid "Display Theme:"
 msgstr ""