diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index 52412965f2..95fb60457c 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2021.12-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-18 00:07+0200\n"
+"POT-Creation-Date: 2021-10-19 20:03+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"
@@ -37,256 +37,6 @@ msgstr[1] ""
 msgid "Monthly posting limit of %d post reached. The post was rejected."
 msgstr ""
 
-#: include/enotify.php:50 include/enotify.php:533
-msgid "[Friendica:Notify]"
-msgstr ""
-
-#: include/enotify.php:114
-#, php-format
-msgid "%s New mail received at %s"
-msgstr ""
-
-#: include/enotify.php:116
-#, php-format
-msgid "%1$s sent you a new private message at %2$s."
-msgstr ""
-
-#: include/enotify.php:117
-msgid "a private message"
-msgstr ""
-
-#: include/enotify.php:117
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr ""
-
-#: include/enotify.php:119
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr ""
-
-#: include/enotify.php:150
-#, php-format
-msgid "%1$s commented on %2$s's %3$s %4$s"
-msgstr ""
-
-#: include/enotify.php:155
-#, php-format
-msgid "%1$s commented on your %2$s %3$s"
-msgstr ""
-
-#: include/enotify.php:159
-#, php-format
-msgid "%1$s commented on their %2$s %3$s"
-msgstr ""
-
-#: include/enotify.php:163 include/enotify.php:568
-#, php-format
-msgid "%1$s Comment to conversation #%2$d by %3$s"
-msgstr ""
-
-#: include/enotify.php:165
-#, php-format
-msgid "%s commented on an item/conversation you have been following."
-msgstr ""
-
-#: include/enotify.php:169 include/enotify.php:184 include/enotify.php:203
-#: include/enotify.php:583
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr ""
-
-#: include/enotify.php:176
-#, php-format
-msgid "%s %s posted to your profile wall"
-msgstr ""
-
-#: include/enotify.php:178
-#, php-format
-msgid "%1$s posted to your profile wall at %2$s"
-msgstr ""
-
-#: include/enotify.php:179
-#, php-format
-msgid "%1$s posted to [url=%2$s]your wall[/url]"
-msgstr ""
-
-#: include/enotify.php:191
-#, php-format
-msgid "%1$s %2$s poked you"
-msgstr ""
-
-#: include/enotify.php:193
-#, php-format
-msgid "%1$s poked you at %2$s"
-msgstr ""
-
-#: include/enotify.php:194
-#, php-format
-msgid "%1$s [url=%2$s]poked you[/url]."
-msgstr ""
-
-#: include/enotify.php:211
-#, php-format
-msgid "%s Introduction received"
-msgstr ""
-
-#: include/enotify.php:213
-#, php-format
-msgid "You've received an introduction from '%1$s' at %2$s"
-msgstr ""
-
-#: include/enotify.php:214
-#, php-format
-msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
-msgstr ""
-
-#: include/enotify.php:219 include/enotify.php:265
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr ""
-
-#: include/enotify.php:221
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
-msgstr ""
-
-#: include/enotify.php:228
-#, php-format
-msgid "%s A new person is sharing with you"
-msgstr ""
-
-#: include/enotify.php:230 include/enotify.php:231
-#, php-format
-msgid "%1$s is sharing with you at %2$s"
-msgstr ""
-
-#: include/enotify.php:238
-#, php-format
-msgid "%s You have a new follower"
-msgstr ""
-
-#: include/enotify.php:240 include/enotify.php:241
-#, php-format
-msgid "You have a new follower at %2$s : %1$s"
-msgstr ""
-
-#: include/enotify.php:254
-#, php-format
-msgid "%s Friend suggestion received"
-msgstr ""
-
-#: include/enotify.php:256
-#, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
-msgstr ""
-
-#: include/enotify.php:257
-#, php-format
-msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
-msgstr ""
-
-#: include/enotify.php:263
-msgid "Name:"
-msgstr ""
-
-#: include/enotify.php:264
-msgid "Photo:"
-msgstr ""
-
-#: include/enotify.php:267
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr ""
-
-#: include/enotify.php:275 include/enotify.php:290
-#, php-format
-msgid "%s Connection accepted"
-msgstr ""
-
-#: include/enotify.php:277 include/enotify.php:292
-#, php-format
-msgid "'%1$s' has accepted your connection request at %2$s"
-msgstr ""
-
-#: include/enotify.php:278 include/enotify.php:293
-#, php-format
-msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
-msgstr ""
-
-#: include/enotify.php:283
-msgid ""
-"You are now mutual friends and may exchange status updates, photos, and "
-"email without restriction."
-msgstr ""
-
-#: include/enotify.php:285
-#, php-format
-msgid "Please visit %s if you wish to make any changes to this relationship."
-msgstr ""
-
-#: include/enotify.php:298
-#, php-format
-msgid ""
-"'%1$s' has chosen to accept you a fan, which restricts some forms of "
-"communication - such as private messaging and some profile interactions. If "
-"this is a celebrity or community page, these settings were applied "
-"automatically."
-msgstr ""
-
-#: include/enotify.php:300
-#, php-format
-msgid ""
-"'%1$s' may choose to extend this into a two-way or more permissive "
-"relationship in the future."
-msgstr ""
-
-#: include/enotify.php:302
-#, php-format
-msgid "Please visit %s  if you wish to make any changes to this relationship."
-msgstr ""
-
-#: include/enotify.php:312 mod/removeme.php:63
-msgid "[Friendica System Notify]"
-msgstr ""
-
-#: include/enotify.php:312
-msgid "registration request"
-msgstr ""
-
-#: include/enotify.php:314
-#, php-format
-msgid "You've received a registration request from '%1$s' at %2$s"
-msgstr ""
-
-#: include/enotify.php:315
-#, php-format
-msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
-msgstr ""
-
-#: include/enotify.php:320
-#, php-format
-msgid ""
-"Full Name:\t%s\n"
-"Site Location:\t%s\n"
-"Login Name:\t%s (%s)"
-msgstr ""
-
-#: include/enotify.php:326
-#, php-format
-msgid "Please visit %s to approve or reject the request."
-msgstr ""
-
-#: include/enotify.php:562
-#, php-format
-msgid "%s %s tagged you"
-msgstr ""
-
-#: include/enotify.php:565
-#, php-format
-msgid "%s %s shared a new post"
-msgstr ""
-
 #: mod/api.php:30 mod/editpost.php:38 mod/events.php:220 mod/follow.php:56
 #: mod/follow.php:130 mod/item.php:185 mod/item.php:190 mod/item.php:936
 #: mod/message.php:69 mod/message.php:111 mod/notes.php:44
@@ -1368,6 +1118,10 @@ msgstr ""
 msgid "Contact not found."
 msgstr ""
 
+#: mod/removeme.php:63 src/Navigation/Notifications/Depository/Notify.php:454
+msgid "[Friendica System Notify]"
+msgstr ""
+
 #: mod/removeme.php:63
 msgid "User deleted their account"
 msgstr ""
@@ -3312,8 +3066,8 @@ msgstr ""
 msgid "last"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:987 src/Content/Text/BBCode.php:1775
-#: src/Content/Text/BBCode.php:1776
+#: src/Content/Text/BBCode.php:987 src/Content/Text/BBCode.php:1781
+#: src/Content/Text/BBCode.php:1782
 msgid "Image/photo"
 msgstr ""
 
@@ -3328,23 +3082,23 @@ msgstr ""
 msgid "Link to source"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1693 src/Content/Text/HTML.php:943
+#: src/Content/Text/BBCode.php:1699 src/Content/Text/HTML.php:943
 msgid "Click to open/close"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1724
+#: src/Content/Text/BBCode.php:1730
 msgid "$1 wrote:"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1780 src/Content/Text/BBCode.php:1781
+#: src/Content/Text/BBCode.php:1786 src/Content/Text/BBCode.php:1787
 msgid "Encrypted content"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1996
+#: src/Content/Text/BBCode.php:2002
 msgid "Invalid source protocol"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:2011
+#: src/Content/Text/BBCode.php:2017
 msgid "Invalid link protocol"
 msgstr ""
 
@@ -10159,6 +9913,262 @@ msgid ""
 "features and resources."
 msgstr ""
 
+#: src/Navigation/Notifications/Depository/Notify.php:192
+#: src/Navigation/Notifications/Depository/Notify.php:675
+msgid "[Friendica:Notify]"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:256
+#, php-format
+msgid "%s New mail received at %s"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:258
+#, php-format
+msgid "%1$s sent you a new private message at %2$s."
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:259
+msgid "a private message"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:259
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:261
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:292
+#, php-format
+msgid "%1$s commented on %2$s's %3$s %4$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:297
+#, php-format
+msgid "%1$s commented on your %2$s %3$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:301
+#, php-format
+msgid "%1$s commented on their %2$s %3$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:305
+#: src/Navigation/Notifications/Depository/Notify.php:710
+#, php-format
+msgid "%1$s Comment to conversation #%2$d by %3$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:307
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:311
+#: src/Navigation/Notifications/Depository/Notify.php:326
+#: src/Navigation/Notifications/Depository/Notify.php:345
+#: src/Navigation/Notifications/Depository/Notify.php:725
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:318
+#, php-format
+msgid "%s %s posted to your profile wall"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:320
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:321
+#, php-format
+msgid "%1$s posted to [url=%2$s]your wall[/url]"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:333
+#, php-format
+msgid "%1$s %2$s poked you"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:335
+#, php-format
+msgid "%1$s poked you at %2$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:336
+#, php-format
+msgid "%1$s [url=%2$s]poked you[/url]."
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:353
+#, php-format
+msgid "%s Introduction received"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:355
+#, php-format
+msgid "You've received an introduction from '%1$s' at %2$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:356
+#, php-format
+msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:361
+#: src/Navigation/Notifications/Depository/Notify.php:407
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:363
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:370
+#, php-format
+msgid "%s A new person is sharing with you"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:372
+#: src/Navigation/Notifications/Depository/Notify.php:373
+#, php-format
+msgid "%1$s is sharing with you at %2$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:380
+#, php-format
+msgid "%s You have a new follower"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:382
+#: src/Navigation/Notifications/Depository/Notify.php:383
+#, php-format
+msgid "You have a new follower at %2$s : %1$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:396
+#, php-format
+msgid "%s Friend suggestion received"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:398
+#, php-format
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:399
+#, php-format
+msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:405
+msgid "Name:"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:406
+msgid "Photo:"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:409
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:417
+#: src/Navigation/Notifications/Depository/Notify.php:432
+#, php-format
+msgid "%s Connection accepted"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:419
+#: src/Navigation/Notifications/Depository/Notify.php:434
+#, php-format
+msgid "'%1$s' has accepted your connection request at %2$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:420
+#: src/Navigation/Notifications/Depository/Notify.php:435
+#, php-format
+msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:425
+msgid ""
+"You are now mutual friends and may exchange status updates, photos, and "
+"email without restriction."
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:427
+#, php-format
+msgid "Please visit %s if you wish to make any changes to this relationship."
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:440
+#, php-format
+msgid ""
+"'%1$s' has chosen to accept you a fan, which restricts some forms of "
+"communication - such as private messaging and some profile interactions. If "
+"this is a celebrity or community page, these settings were applied "
+"automatically."
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:442
+#, php-format
+msgid ""
+"'%1$s' may choose to extend this into a two-way or more permissive "
+"relationship in the future."
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:444
+#, php-format
+msgid "Please visit %s  if you wish to make any changes to this relationship."
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:454
+msgid "registration request"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:456
+#, php-format
+msgid "You've received a registration request from '%1$s' at %2$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:457
+#, php-format
+msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:462
+#, php-format
+msgid ""
+"Full Name:\t%s\n"
+"Site Location:\t%s\n"
+"Login Name:\t%s (%s)"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:468
+#, php-format
+msgid "Please visit %s to approve or reject the request."
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:704
+#, php-format
+msgid "%s %s tagged you"
+msgstr ""
+
+#: src/Navigation/Notifications/Depository/Notify.php:707
+#, php-format
+msgid "%s %s shared a new post"
+msgstr ""
+
 #: src/Navigation/Notifications/Factory/FormattedNotification.php:89
 #, php-format
 msgid "%s liked %s's post"