Merge branch '2024.09-rc' into merge-2024.09-rc-into-develop

diff --cc .woodpecker/.phpunit.yml
Simple merge

diff --cc src/Core/Worker.php
Simple merge

diff --cc src/Model/Post/Media.php
Simple merge

diff --cc src/Module/BaseSettings.php
Simple merge

diff --cc src/Module/Settings/Account.php
Simple merge

diff --cc src/Protocol/ATProtocol.php
Simple merge

diff --cc src/Protocol/ATProtocol/Actor.php
Simple merge

diff --cc src/Protocol/ATProtocol/Processor.php
Simple merge

diff --cc src/Protocol/ActivityPub/Delivery.php
Simple merge

diff --cc src/Util/JsonLD.php
Simple merge

diff --cc src/Worker/Notifier.php
Simple merge

diff --cc view/lang/C/messages.po
index ab112b623b6554737a92570ae26ce4cf454e43a9,abb5d717c5dfb344b52a0452a8a9729ecc187f15..fdec55075ca3d15b696ed4ab690db93c7875c9ff
--- 1/view/lang/C/messages.po
--- 2/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@@ -6,9 -6,9 +6,9 @@@
  #, fuzzy
  msgid ""
  msgstr ""
 -"Project-Id-Version: 2024.09-rc\n"
 +"Project-Id-Version: 2024.12-dev\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2024-12-07 15:24+0000\n"
 -"POT-Creation-Date: 2024-12-22 07:45+0000\n"
++"POT-Creation-Date: 2024-12-23 10:09+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"
@@@ -55,23 -55,25 +55,25 @@@ msgstr "
  #: src/Module/Contact/Follow.php:145 src/Module/Contact/MatchInterests.php:73
  #: src/Module/Contact/Suggestions.php:40 src/Module/Contact/Unfollow.php:52
  #: src/Module/Contact/Unfollow.php:66 src/Module/Contact/Unfollow.php:98
 -#: src/Module/FollowConfirm.php:24 src/Module/FriendSuggest.php:43
 -#: src/Module/Invite.php:28 src/Module/Invite.php:117
 +#: src/Module/FollowConfirm.php:24 src/Module/FriendSuggest.php:44
 +#: src/Module/Invite.php:28 src/Module/Invite.php:116
  #: src/Module/Notifications/Notification.php:62
  #: src/Module/Notifications/Notification.php:93
 -#: src/Module/OStatus/Subscribe.php:54 src/Module/Post/Edit.php:62
 -#: src/Module/Profile/Common.php:61 src/Module/Profile/Contacts.php:64
 -#: src/Module/Profile/Photos.php:78 src/Module/Profile/Schedule.php:25
 -#: src/Module/Profile/Schedule.php:42 src/Module/Register.php:70
 -#: src/Module/Register.php:83 src/Module/Register.php:199
 -#: src/Module/Register.php:238 src/Module/Search/Directory.php:23
 -#: src/Module/Settings/Account.php:34 src/Module/Settings/Account.php:339
 +#: src/Module/OStatus/Subscribe.php:54 src/Module/Post/Edit.php:67
 +#: src/Module/Profile/Common.php:63 src/Module/Profile/Contacts.php:66
 +#: src/Module/Profile/Photos.php:81 src/Module/Profile/Schedule.php:25
 +#: src/Module/Profile/Schedule.php:42 src/Module/Register.php:71
 +#: src/Module/Register.php:84 src/Module/Register.php:200
 +#: src/Module/Register.php:239 src/Module/Search/Directory.php:23
- #: src/Module/Settings/Account.php:36 src/Module/Settings/Account.php:375
++#: src/Module/Settings/Account.php:34 src/Module/Settings/Account.php:337
  #: src/Module/Settings/Channels.php:52 src/Module/Settings/Channels.php:127
 -#: src/Module/Settings/Delegation.php:76 src/Module/Settings/Display.php:77
 -#: src/Module/Settings/Display.php:191
 -#: src/Module/Settings/Profile/Photo/Crop.php:151
+ #: src/Module/Settings/ContactImport.php:49
+ #: src/Module/Settings/ContactImport.php:96
 +#: src/Module/Settings/Delegation.php:76 src/Module/Settings/Display.php:80
 +#: src/Module/Settings/Display.php:194
 +#: src/Module/Settings/Profile/Photo/Crop.php:148
  #: src/Module/Settings/Profile/Photo/Index.php:96
 -#: src/Module/Settings/RemoveMe.php:105 src/Module/Settings/UserExport.php:64
 +#: src/Module/Settings/RemoveMe.php:103 src/Module/Settings/UserExport.php:64
  #: src/Module/Settings/UserExport.php:100
  #: src/Module/Settings/UserExport.php:199
  #: src/Module/Settings/UserExport.php:219
@@@ -280,10 -282,10 +282,10 @@@ msgstr "
  msgid "Insert web link"
  msgstr ""
  
 -#: mod/message.php:188 mod/message.php:344 mod/photos.php:1255
 -#: src/Content/Conversation.php:386 src/Content/Conversation.php:1562
 -#: src/Module/Item/Compose.php:199 src/Module/Post/Edit.php:131
 +#: mod/message.php:188 mod/message.php:344 mod/photos.php:1253
 +#: src/Content/Conversation.php:389 src/Content/Conversation.php:1565
 +#: src/Module/Item/Compose.php:202 src/Module/Post/Edit.php:136
- #: src/Object/Post.php:604
+ #: src/Object/Post.php:605
  msgid "Please wait"
  msgstr ""
  
@@@ -303,9 -305,9 +305,9 @@@
  #: src/Module/Moderation/Report/Create.php:169
  #: src/Module/Moderation/Report/Create.php:197
  #: src/Module/Moderation/Report/Create.php:249
 -#: src/Module/Profile/Profile.php:262 src/Module/Settings/Profile/Index.php:248
 -#: src/Module/Settings/Server/Action.php:65 src/Module/User/Delegation.php:175
 +#: src/Module/Profile/Profile.php:265 src/Module/Settings/Profile/Index.php:248
 +#: src/Module/Settings/Server/Action.php:65 src/Module/User/Delegation.php:177
- #: src/Object/Post.php:1145 view/theme/duepuntozero/config.php:73
+ #: src/Object/Post.php:1146 view/theme/duepuntozero/config.php:73
  #: view/theme/frio/config.php:155 view/theme/quattro/config.php:75
  #: view/theme/vier/config.php:123
  msgid "Submit"
@@@ -586,57 -588,57 +588,57 @@@ msgstr "
  msgid "Rotate CCW (left)"
  msgstr ""
  
 -#: mod/photos.php:1093 mod/photos.php:1149 mod/photos.php:1229
 -#: src/Module/Contact.php:600 src/Module/Item/Compose.php:181
 +#: mod/photos.php:1091 mod/photos.php:1147 mod/photos.php:1227
 +#: src/Module/Contact.php:600 src/Module/Item/Compose.php:184
- #: src/Object/Post.php:1142
+ #: src/Object/Post.php:1143
  msgid "This is you"
  msgstr ""
  
 -#: mod/photos.php:1095 mod/photos.php:1151 mod/photos.php:1231
 -#: src/Module/Moderation/Reports.php:102 src/Object/Post.php:599
 +#: mod/photos.php:1093 mod/photos.php:1149 mod/photos.php:1229
- #: src/Module/Moderation/Reports.php:105 src/Object/Post.php:598
- #: src/Object/Post.php:1144
++#: src/Module/Moderation/Reports.php:105 src/Object/Post.php:599
+ #: src/Object/Post.php:1145
  msgid "Comment"
  msgstr ""
  
 -#: mod/photos.php:1097 mod/photos.php:1153 mod/photos.php:1233
 -#: src/Content/Conversation.php:400 src/Module/Calendar/Event/Form.php:234
 -#: src/Module/Item/Compose.php:194 src/Module/Post/Edit.php:151
 +#: mod/photos.php:1095 mod/photos.php:1151 mod/photos.php:1231
 +#: src/Content/Conversation.php:403 src/Module/Calendar/Event/Form.php:234
 +#: src/Module/Item/Compose.php:197 src/Module/Post/Edit.php:156
- #: src/Object/Post.php:1158
+ #: src/Object/Post.php:1159
  msgid "Preview"
  msgstr ""
  
 -#: mod/photos.php:1098 src/Content/Conversation.php:354
 -#: src/Module/Post/Edit.php:116 src/Object/Post.php:1147
 +#: mod/photos.php:1096 src/Content/Conversation.php:357
- #: src/Module/Post/Edit.php:121 src/Object/Post.php:1146
++#: src/Module/Post/Edit.php:121 src/Object/Post.php:1147
  msgid "Loading..."
  msgstr ""
  
 -#: mod/photos.php:1190 src/Content/Conversation.php:1484
 +#: mod/photos.php:1188 src/Content/Conversation.php:1487
- #: src/Object/Post.php:260
+ #: src/Object/Post.php:261
  msgid "Select"
  msgstr ""
  
 -#: mod/photos.php:1191 src/Content/Conversation.php:1485
 -#: src/Module/Moderation/Users/Active.php:122
 -#: src/Module/Moderation/Users/Blocked.php:122
 -#: src/Module/Moderation/Users/Index.php:137
 +#: mod/photos.php:1189 src/Content/Conversation.php:1488
 +#: src/Module/Moderation/Users/Active.php:125
 +#: src/Module/Moderation/Users/Blocked.php:125
 +#: src/Module/Moderation/Users/Index.php:140
- #: src/Module/Settings/Connectors.php:233
+ #: src/Module/Settings/Connectors.php:226
  #: src/Module/Settings/Server/Index.php:95
  msgid "Delete"
  msgstr ""
  
- #: mod/photos.php:1250 src/Object/Post.php:426
 -#: mod/photos.php:1252 src/Object/Post.php:427
++#: mod/photos.php:1250 src/Object/Post.php:427
  msgid "Like"
  msgstr ""
  
- #: mod/photos.php:1251 src/Object/Post.php:426
 -#: mod/photos.php:1253 src/Object/Post.php:427
++#: mod/photos.php:1251 src/Object/Post.php:427
  msgid "I like this (toggle)"
  msgstr ""
  
- #: mod/photos.php:1252 src/Object/Post.php:427
 -#: mod/photos.php:1254 src/Object/Post.php:428
++#: mod/photos.php:1252 src/Object/Post.php:428
  msgid "Dislike"
  msgstr ""
  
- #: mod/photos.php:1254 src/Object/Post.php:427
 -#: mod/photos.php:1256 src/Object/Post.php:428
++#: mod/photos.php:1254 src/Object/Post.php:428
  msgid "I don't like this (toggle)"
  msgstr ""
  
@@@ -644,7 -646,11 +646,7 @@@
  msgid "Map"
  msgstr ""
  
- #: src/App.php:461
 -#: src/App.php:432
 -msgid "No system theme config value set."
 -msgstr ""
 -
 -#: src/App.php:540
++#: src/App.php:255
  msgid "Apologies but the website is unavailable at the moment."
  msgstr ""
  
@@@ -959,12 -958,12 +961,12 @@@ msgid "Enter new password: 
  msgstr ""
  
  #: src/Console/User.php:196 src/Module/Security/PasswordTooLong.php:55
--#: src/Module/Settings/Account.php:59
++#: src/Module/Settings/Account.php:57
  msgid "Password update failed. Please try again."
  msgstr ""
  
  #: src/Console/User.php:199 src/Module/Security/PasswordTooLong.php:58
--#: src/Module/Settings/Account.php:62
++#: src/Module/Settings/Account.php:60
  msgid "Password changed."
  msgstr ""
  
@@@ -1230,8 -1229,8 +1232,8 @@@ msgstr[1] "
  msgid "Visible to <strong>everybody</strong>"
  msgstr ""
  
 -#: src/Content/Conversation.php:324 src/Module/Item/Compose.php:193
 +#: src/Content/Conversation.php:327 src/Module/Item/Compose.php:196
- #: src/Object/Post.php:1157
+ #: src/Object/Post.php:1158
  msgid "Please enter a image/video/audio/webpage URL:"
  msgstr ""
  
@@@ -1275,53 -1274,53 +1277,53 @@@ msgstr "
  msgid "attach file"
  msgstr ""
  
 -#: src/Content/Conversation.php:359 src/Module/Item/Compose.php:183
 -#: src/Module/Post/Edit.php:157 src/Object/Post.php:1148
 +#: src/Content/Conversation.php:362 src/Module/Item/Compose.php:186
- #: src/Module/Post/Edit.php:162 src/Object/Post.php:1147
++#: src/Module/Post/Edit.php:162 src/Object/Post.php:1148
  msgid "Bold"
  msgstr ""
  
 -#: src/Content/Conversation.php:360 src/Module/Item/Compose.php:184
 -#: src/Module/Post/Edit.php:158 src/Object/Post.php:1149
 +#: src/Content/Conversation.php:363 src/Module/Item/Compose.php:187
- #: src/Module/Post/Edit.php:163 src/Object/Post.php:1148
++#: src/Module/Post/Edit.php:163 src/Object/Post.php:1149
  msgid "Italic"
  msgstr ""
  
 -#: src/Content/Conversation.php:361 src/Module/Item/Compose.php:185
 -#: src/Module/Post/Edit.php:159 src/Object/Post.php:1150
 +#: src/Content/Conversation.php:364 src/Module/Item/Compose.php:188
- #: src/Module/Post/Edit.php:164 src/Object/Post.php:1149
++#: src/Module/Post/Edit.php:164 src/Object/Post.php:1150
  msgid "Underline"
  msgstr ""
  
 -#: src/Content/Conversation.php:362 src/Module/Item/Compose.php:186
 -#: src/Module/Post/Edit.php:160 src/Object/Post.php:1152
 +#: src/Content/Conversation.php:365 src/Module/Item/Compose.php:189
- #: src/Module/Post/Edit.php:165 src/Object/Post.php:1151
++#: src/Module/Post/Edit.php:165 src/Object/Post.php:1152
  msgid "Quote"
  msgstr ""
  
 -#: src/Content/Conversation.php:363 src/Module/Item/Compose.php:187
 -#: src/Module/Post/Edit.php:161 src/Object/Post.php:1153
 +#: src/Content/Conversation.php:366 src/Module/Item/Compose.php:190
- #: src/Module/Post/Edit.php:166 src/Object/Post.php:1152
++#: src/Module/Post/Edit.php:166 src/Object/Post.php:1153
  msgid "Add emojis"
  msgstr ""
  
 -#: src/Content/Conversation.php:364 src/Module/Item/Compose.php:188
 +#: src/Content/Conversation.php:367 src/Module/Item/Compose.php:191
- #: src/Object/Post.php:1150
+ #: src/Object/Post.php:1151
  msgid "Content Warning"
  msgstr ""
  
 -#: src/Content/Conversation.php:365 src/Module/Item/Compose.php:189
 -#: src/Module/Post/Edit.php:162 src/Object/Post.php:1154
 +#: src/Content/Conversation.php:368 src/Module/Item/Compose.php:192
- #: src/Module/Post/Edit.php:167 src/Object/Post.php:1153
++#: src/Module/Post/Edit.php:167 src/Object/Post.php:1154
  msgid "Code"
  msgstr ""
  
 -#: src/Content/Conversation.php:366 src/Module/Item/Compose.php:190
 +#: src/Content/Conversation.php:369 src/Module/Item/Compose.php:193
- #: src/Object/Post.php:1154
+ #: src/Object/Post.php:1155
  msgid "Image"
  msgstr ""
  
 -#: src/Content/Conversation.php:367 src/Module/Item/Compose.php:191
 -#: src/Module/Post/Edit.php:163 src/Object/Post.php:1156
 +#: src/Content/Conversation.php:370 src/Module/Item/Compose.php:194
- #: src/Module/Post/Edit.php:168 src/Object/Post.php:1155
++#: src/Module/Post/Edit.php:168 src/Object/Post.php:1156
  msgid "Link"
  msgstr ""
  
 -#: src/Content/Conversation.php:368 src/Module/Item/Compose.php:192
 -#: src/Module/Post/Edit.php:164 src/Object/Post.php:1157
 +#: src/Content/Conversation.php:371 src/Module/Item/Compose.php:195
- #: src/Module/Post/Edit.php:169 src/Object/Post.php:1156
++#: src/Module/Post/Edit.php:169 src/Object/Post.php:1157
  msgid "Link or Media"
  msgstr ""
  
@@@ -1477,25 -1476,25 +1479,25 @@@ msgstr "
  msgid "Pushed to us"
  msgstr ""
  
- #: src/Content/Conversation.php:1507 src/Object/Post.php:247
 -#: src/Content/Conversation.php:1504 src/Object/Post.php:248
++#: src/Content/Conversation.php:1507 src/Object/Post.php:248
  msgid "Pinned item"
  msgstr ""
  
- #: src/Content/Conversation.php:1524 src/Object/Post.php:541
- #: src/Object/Post.php:542
 -#: src/Content/Conversation.php:1521 src/Object/Post.php:542
++#: src/Content/Conversation.php:1524 src/Object/Post.php:542
+ #: src/Object/Post.php:543
  #, php-format
  msgid "View %s's profile @ %s"
  msgstr ""
  
- #: src/Content/Conversation.php:1538 src/Object/Post.php:529
 -#: src/Content/Conversation.php:1535 src/Object/Post.php:530
++#: src/Content/Conversation.php:1538 src/Object/Post.php:530
  msgid "Categories:"
  msgstr ""
  
- #: src/Content/Conversation.php:1539 src/Object/Post.php:530
 -#: src/Content/Conversation.php:1536 src/Object/Post.php:531
++#: src/Content/Conversation.php:1539 src/Object/Post.php:531
  msgid "Filed under:"
  msgstr ""
  
- #: src/Content/Conversation.php:1547 src/Object/Post.php:556
 -#: src/Content/Conversation.php:1544 src/Object/Post.php:557
++#: src/Content/Conversation.php:1547 src/Object/Post.php:557
  #, php-format
  msgid "%s from %s"
  msgstr ""
@@@ -1733,8 -1732,8 +1735,8 @@@ msgstr "
  msgid "Display posts with the selected protocols."
  msgstr ""
  
 -#: src/Content/Feature.php:119 src/Content/Widget.php:558
 -#: src/Module/Settings/Account.php:395
 +#: src/Content/Feature.php:119 src/Content/Widget.php:561
- #: src/Module/Settings/Account.php:429
++#: src/Module/Settings/Account.php:391
  msgid "Account Types"
  msgstr ""
  
@@@ -1904,17 -1903,17 +1906,17 @@@ msgstr "
  msgid "Collapse"
  msgstr ""
  
- #: src/Content/Item.php:429 src/Object/Post.php:288
 -#: src/Content/Item.php:424 src/Object/Post.php:289
++#: src/Content/Item.php:429 src/Object/Post.php:289
  #, php-format
  msgid "Ignore %s server"
  msgstr ""
  
 -#: src/Content/Item.php:428 src/Module/Settings/Channels.php:188
 +#: src/Content/Item.php:433 src/Module/Settings/Channels.php:188
- #: src/Module/Settings/Channels.php:209 src/Object/Post.php:502
+ #: src/Module/Settings/Channels.php:209 src/Object/Post.php:503
  msgid "Languages"
  msgstr ""
  
- #: src/Content/Item.php:436 src/Object/Post.php:582
 -#: src/Content/Item.php:431 src/Object/Post.php:583
++#: src/Content/Item.php:436 src/Object/Post.php:583
  msgid "Search Text"
  msgstr ""
  
@@@ -2174,8 -2173,8 +2176,8 @@@ msgstr "
  msgid "Manage other pages"
  msgstr ""
  
 -#: src/Content/Nav.php:313 src/Module/Admin/Addons/Details.php:100
 -#: src/Module/Admin/Themes/Details.php:85 src/Module/BaseSettings.php:175
 +#: src/Content/Nav.php:313 src/Module/Admin/Addons/Details.php:98
- #: src/Module/Admin/Themes/Details.php:85 src/Module/BaseSettings.php:170
++#: src/Module/Admin/Themes/Details.php:85 src/Module/BaseSettings.php:177
  #: src/Module/Welcome.php:38 view/theme/frio/theme.php:233
  msgid "Settings"
  msgstr ""
@@@ -3467,7 -3466,7 +3469,7 @@@ msgstr "
  msgid "[no subject]"
  msgstr ""
  
- #: src/Model/Photo.php:1191 src/Module/Media/Photo/Upload.php:154
 -#: src/Model/Photo.php:1195 src/Module/Media/Photo/Upload.php:154
++#: src/Model/Photo.php:1192 src/Module/Media/Photo/Upload.php:154
  msgid "Wall Photos"
  msgstr ""
  
@@@ -3923,10 -3922,11 +3925,11 @@@ msgstr "
  #: src/Module/Admin/Addons/Index.php:61 src/Module/Admin/Features.php:69
  #: src/Module/Admin/Logs/Settings.php:76 src/Module/Admin/Site.php:450
  #: src/Module/Admin/Themes/Index.php:105 src/Module/Admin/Tos.php:72
- #: src/Module/Settings/Account.php:545 src/Module/Settings/Addons.php:64
- #: src/Module/Settings/Connectors.php:149
- #: src/Module/Settings/Connectors.php:235
 -#: src/Module/Settings/Account.php:511 src/Module/Settings/Addons.php:64
++#: src/Module/Settings/Account.php:507 src/Module/Settings/Addons.php:64
+ #: src/Module/Settings/Connectors.php:143
+ #: src/Module/Settings/Connectors.php:228
+ #: src/Module/Settings/ContactImport.php:110
 -#: src/Module/Settings/Delegation.php:179 src/Module/Settings/Display.php:314
 +#: src/Module/Settings/Delegation.php:179 src/Module/Settings/Display.php:317
  #: src/Module/Settings/Features.php:61
  msgid "Save Settings"
  msgstr ""
@@@ -5766,7 -5766,7 +5769,7 @@@ msgstr "
  msgid "Display"
  msgstr ""
  
- #: src/Module/BaseSettings.php:120 src/Module/Settings/Connectors.php:195
 -#: src/Module/BaseSettings.php:118 src/Module/Settings/Connectors.php:189
++#: src/Module/BaseSettings.php:120 src/Module/Settings/Connectors.php:189
  msgid "Social Networks"
  msgstr ""
  
@@@ -5782,11 -5782,15 +5785,15 @@@ msgstr "
  msgid "Remote servers"
  msgstr ""
  
- #: src/Module/BaseSettings.php:155 src/Module/Settings/UserExport.php:84
 -#: src/Module/BaseSettings.php:153 src/Module/Settings/ContactImport.php:109
++#: src/Module/BaseSettings.php:155 src/Module/Settings/ContactImport.php:109
+ msgid "Import Contacts"
+ msgstr ""
+ 
 -#: src/Module/BaseSettings.php:160 src/Module/Settings/UserExport.php:84
++#: src/Module/BaseSettings.php:162 src/Module/Settings/UserExport.php:84
  msgid "Export personal data"
  msgstr ""
  
- #: src/Module/BaseSettings.php:162
 -#: src/Module/BaseSettings.php:167
++#: src/Module/BaseSettings.php:169
  msgid "Remove account"
  msgstr ""
  
@@@ -7432,23 -7448,23 +7439,23 @@@ msgstr "
  msgid "List of pending user deletions"
  msgstr ""
  
- #: src/Module/Moderation/BaseUsers.php:110 src/Module/Settings/Account.php:469
 -#: src/Module/Moderation/BaseUsers.php:108 src/Module/Settings/Account.php:435
++#: src/Module/Moderation/BaseUsers.php:110 src/Module/Settings/Account.php:431
  msgid "Normal Account Page"
  msgstr ""
  
- #: src/Module/Moderation/BaseUsers.php:111 src/Module/Settings/Account.php:476
 -#: src/Module/Moderation/BaseUsers.php:109 src/Module/Settings/Account.php:442
++#: src/Module/Moderation/BaseUsers.php:111 src/Module/Settings/Account.php:438
  msgid "Soapbox Page"
  msgstr ""
  
- #: src/Module/Moderation/BaseUsers.php:112 src/Module/Settings/Account.php:483
 -#: src/Module/Moderation/BaseUsers.php:110 src/Module/Settings/Account.php:449
++#: src/Module/Moderation/BaseUsers.php:112 src/Module/Settings/Account.php:445
  msgid "Public Group"
  msgstr ""
  
- #: src/Module/Moderation/BaseUsers.php:113 src/Module/Settings/Account.php:490
 -#: src/Module/Moderation/BaseUsers.php:111 src/Module/Settings/Account.php:456
++#: src/Module/Moderation/BaseUsers.php:113 src/Module/Settings/Account.php:452
  msgid "Public Group - Restricted"
  msgstr ""
  
- #: src/Module/Moderation/BaseUsers.php:114 src/Module/Settings/Account.php:497
 -#: src/Module/Moderation/BaseUsers.php:112 src/Module/Settings/Account.php:463
++#: src/Module/Moderation/BaseUsers.php:114 src/Module/Settings/Account.php:459
  msgid "Automatic Friend Page"
  msgstr ""
  
@@@ -7456,23 -7472,23 +7463,23 @@@
  msgid "Private Group"
  msgstr ""
  
 -#: src/Module/Moderation/BaseUsers.php:116 src/Module/Moderation/Summary.php:39
 -#: src/Module/Settings/Account.php:406
 +#: src/Module/Moderation/BaseUsers.php:118 src/Module/Moderation/Summary.php:42
- #: src/Module/Settings/Account.php:440
++#: src/Module/Settings/Account.php:402
  msgid "Personal Page"
  msgstr ""
  
 -#: src/Module/Moderation/BaseUsers.php:117 src/Module/Moderation/Summary.php:40
 -#: src/Module/Settings/Account.php:413
 +#: src/Module/Moderation/BaseUsers.php:119 src/Module/Moderation/Summary.php:43
- #: src/Module/Settings/Account.php:447
++#: src/Module/Settings/Account.php:409
  msgid "Organisation Page"
  msgstr ""
  
 -#: src/Module/Moderation/BaseUsers.php:118 src/Module/Moderation/Summary.php:41
 -#: src/Module/Settings/Account.php:420
 +#: src/Module/Moderation/BaseUsers.php:120 src/Module/Moderation/Summary.php:44
- #: src/Module/Settings/Account.php:454
++#: src/Module/Settings/Account.php:416
  msgid "News Page"
  msgstr ""
  
 -#: src/Module/Moderation/BaseUsers.php:119 src/Module/Moderation/Summary.php:42
 -#: src/Module/Settings/Account.php:427
 +#: src/Module/Moderation/BaseUsers.php:121 src/Module/Moderation/Summary.php:45
- #: src/Module/Settings/Account.php:461
++#: src/Module/Settings/Account.php:423
  msgid "Community Group"
  msgstr ""
  
@@@ -8050,7 -8066,7 +8057,7 @@@ msgstr[1] "
  msgid "URL of the reported contact."
  msgstr ""
  
- #: src/Module/Moderation/Summary.php:46 src/Module/Settings/Account.php:418
 -#: src/Module/Moderation/Summary.php:43 src/Module/Settings/Account.php:384
++#: src/Module/Moderation/Summary.php:46 src/Module/Settings/Account.php:380
  msgid "Channel Relay"
  msgstr ""
  
@@@ -8424,7 -8440,7 +8431,7 @@@ msgstr "
  msgid "Keep this window open until done."
  msgstr ""
  
--#: src/Module/OpenSearch.php:54
++#: src/Module/OpenSearch.php:55
  #, php-format
  msgid "Search in Friendica %s"
  msgstr ""
@@@ -8754,8 -8770,8 +8761,8 @@@ msgstr "
  msgid "Please repeat your e-mail address:"
  msgstr ""
  
 -#: src/Module/Register.php:155 src/Module/Security/PasswordTooLong.php:86
 -#: src/Module/Settings/Account.php:517
 +#: src/Module/Register.php:156 src/Module/Security/PasswordTooLong.php:86
- #: src/Module/Settings/Account.php:551
++#: src/Module/Settings/Account.php:513
  msgid "New Password:"
  msgstr ""
  
@@@ -8763,8 -8779,8 +8770,8 @@@
  msgid "Leave empty for an auto generated password."
  msgstr ""
  
 -#: src/Module/Register.php:156 src/Module/Security/PasswordTooLong.php:87
 -#: src/Module/Settings/Account.php:518
 +#: src/Module/Register.php:157 src/Module/Security/PasswordTooLong.php:87
- #: src/Module/Settings/Account.php:552
++#: src/Module/Settings/Account.php:514
  msgid "Confirm:"
  msgstr ""
  
@@@ -8949,7 -8965,7 +8956,7 @@@ msgid "Account not found. Please regist
  msgstr ""
  
  #: src/Module/Security/PasswordTooLong.php:43
--#: src/Module/Settings/Account.php:51
++#: src/Module/Settings/Account.php:49
  msgid "Passwords do not match."
  msgstr ""
  
@@@ -8958,7 -8974,7 +8965,7 @@@ msgid "Password does not need changing.
  msgstr ""
  
  #: src/Module/Security/PasswordTooLong.php:63
--#: src/Module/Settings/Account.php:65
++#: src/Module/Settings/Account.php:63
  msgid "Password unchanged."
  msgstr ""
  
@@@ -8975,22 -8991,22 +8982,22 @@@ msgid "Update Password
  msgstr ""
  
  #: src/Module/Security/PasswordTooLong.php:85
- #: src/Module/Settings/Account.php:553
 -#: src/Module/Settings/Account.php:519
++#: src/Module/Settings/Account.php:515
  msgid "Current Password:"
  msgstr ""
  
  #: src/Module/Security/PasswordTooLong.php:85
- #: src/Module/Settings/Account.php:553
 -#: src/Module/Settings/Account.php:519
++#: src/Module/Settings/Account.php:515
  msgid "Your current password to confirm the changes"
  msgstr ""
  
  #: src/Module/Security/PasswordTooLong.php:86
- #: src/Module/Settings/Account.php:537
 -#: src/Module/Settings/Account.php:503
++#: src/Module/Settings/Account.php:499
  msgid "Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces and accentuated letters."
  msgstr ""
  
  #: src/Module/Security/PasswordTooLong.php:86
- #: src/Module/Settings/Account.php:538
 -#: src/Module/Settings/Account.php:504
++#: src/Module/Settings/Account.php:500
  msgid "Password length is limited to 72 characters."
  msgstr ""
  
@@@ -9084,445 -9100,425 +9091,425 @@@ msgstr "
  msgid "Verify code and complete login"
  msgstr ""
  
--#: src/Module/Settings/Account.php:80
++#: src/Module/Settings/Account.php:78
  msgid "Please use a shorter name."
  msgstr ""
  
--#: src/Module/Settings/Account.php:83
++#: src/Module/Settings/Account.php:81
  msgid "Name too short."
  msgstr ""
  
--#: src/Module/Settings/Account.php:92
++#: src/Module/Settings/Account.php:90
  msgid "Wrong Password."
  msgstr ""
  
--#: src/Module/Settings/Account.php:97
++#: src/Module/Settings/Account.php:95
  msgid "Invalid email."
  msgstr ""
  
--#: src/Module/Settings/Account.php:101
++#: src/Module/Settings/Account.php:99
  msgid "Cannot change to that email."
  msgstr ""
  
--#: src/Module/Settings/Account.php:130 src/Module/Settings/Account.php:179
--#: src/Module/Settings/Account.php:200 src/Module/Settings/Account.php:284
--#: src/Module/Settings/Account.php:313
++#: src/Module/Settings/Account.php:128 src/Module/Settings/Account.php:177
++#: src/Module/Settings/Account.php:198 src/Module/Settings/Account.php:282
++#: src/Module/Settings/Account.php:311
  msgid "Settings were not updated."
  msgstr ""
  
- #: src/Module/Settings/Account.php:331
- msgid "Contact CSV file upload error"
- msgstr ""
- 
- #: src/Module/Settings/Account.php:350
- msgid "Importing Contacts done"
- msgstr ""
- 
- #: src/Module/Settings/Account.php:363
 -#: src/Module/Settings/Account.php:327
++#: src/Module/Settings/Account.php:325
  msgid "Relocate message has been send to your contacts"
  msgstr ""
  
- #: src/Module/Settings/Account.php:380
 -#: src/Module/Settings/Account.php:344
++#: src/Module/Settings/Account.php:342
  msgid "Unable to find your profile. Please contact your admin."
  msgstr ""
  
- #: src/Module/Settings/Account.php:420
 -#: src/Module/Settings/Account.php:386
++#: src/Module/Settings/Account.php:382
  msgid "Account for a service that automatically shares content based on user defined channels."
  msgstr ""
  
- #: src/Module/Settings/Account.php:430
 -#: src/Module/Settings/Account.php:396
++#: src/Module/Settings/Account.php:392
  msgid "Personal Page Subtypes"
  msgstr ""
  
- #: src/Module/Settings/Account.php:431
 -#: src/Module/Settings/Account.php:397
++#: src/Module/Settings/Account.php:393
  msgid "Community Group Subtypes"
  msgstr ""
  
- #: src/Module/Settings/Account.php:442
 -#: src/Module/Settings/Account.php:408
++#: src/Module/Settings/Account.php:404
  msgid "Account for a personal profile."
  msgstr ""
  
- #: src/Module/Settings/Account.php:449
 -#: src/Module/Settings/Account.php:415
++#: src/Module/Settings/Account.php:411
  msgid "Account for an organisation that automatically approves contact requests as \"Followers\"."
  msgstr ""
  
- #: src/Module/Settings/Account.php:456
 -#: src/Module/Settings/Account.php:422
++#: src/Module/Settings/Account.php:418
  msgid "Account for a news reflector that automatically approves contact requests as \"Followers\"."
  msgstr ""
  
- #: src/Module/Settings/Account.php:463
 -#: src/Module/Settings/Account.php:429
++#: src/Module/Settings/Account.php:425
  msgid "Account for community discussions."
  msgstr ""
  
- #: src/Module/Settings/Account.php:471
 -#: src/Module/Settings/Account.php:437
++#: src/Module/Settings/Account.php:433
  msgid "Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."
  msgstr ""
  
- #: src/Module/Settings/Account.php:478
 -#: src/Module/Settings/Account.php:444
++#: src/Module/Settings/Account.php:440
  msgid "Account for a public profile that automatically approves contact requests as \"Followers\"."
  msgstr ""
  
- #: src/Module/Settings/Account.php:485
 -#: src/Module/Settings/Account.php:451
++#: src/Module/Settings/Account.php:447
  msgid "Automatically approves all contact requests."
  msgstr ""
  
- #: src/Module/Settings/Account.php:492
 -#: src/Module/Settings/Account.php:458
++#: src/Module/Settings/Account.php:454
  msgid "Contact requests have to be manually approved."
  msgstr ""
  
- #: src/Module/Settings/Account.php:499
 -#: src/Module/Settings/Account.php:465
++#: src/Module/Settings/Account.php:461
  msgid "Account for a popular profile that automatically approves contact requests as \"Friends\"."
  msgstr ""
  
- #: src/Module/Settings/Account.php:504
 -#: src/Module/Settings/Account.php:470
++#: src/Module/Settings/Account.php:466
  msgid "Private Group [Experimental]"
  msgstr ""
  
- #: src/Module/Settings/Account.php:506
 -#: src/Module/Settings/Account.php:472
++#: src/Module/Settings/Account.php:468
  msgid "Requires manual approval of contact requests."
  msgstr ""
  
- #: src/Module/Settings/Account.php:515
 -#: src/Module/Settings/Account.php:481
++#: src/Module/Settings/Account.php:477
  msgid "OpenID:"
  msgstr ""
  
- #: src/Module/Settings/Account.php:515
 -#: src/Module/Settings/Account.php:481
++#: src/Module/Settings/Account.php:477
  msgid "(Optional) Allow this OpenID to login to this account."
  msgstr ""
  
- #: src/Module/Settings/Account.php:523
 -#: src/Module/Settings/Account.php:489
++#: src/Module/Settings/Account.php:485
  msgid "Publish your profile in your local site directory?"
  msgstr ""
  
- #: src/Module/Settings/Account.php:523
 -#: src/Module/Settings/Account.php:489
++#: src/Module/Settings/Account.php:485
  #, php-format
  msgid "Your profile will be published in this node's <a href=\"%s\">local directory</a>. Your profile details may be publicly visible depending on the system settings."
  msgstr ""
  
- #: src/Module/Settings/Account.php:529
 -#: src/Module/Settings/Account.php:495
++#: src/Module/Settings/Account.php:491
  #, php-format
  msgid "Your profile will also be published in the global friendica directories (e.g. <a href=\"%s\">%s</a>)."
  msgstr ""
  
- #: src/Module/Settings/Account.php:542
 -#: src/Module/Settings/Account.php:508
++#: src/Module/Settings/Account.php:504
  msgid "Account Settings"
  msgstr ""
  
- #: src/Module/Settings/Account.php:543
 -#: src/Module/Settings/Account.php:509
++#: src/Module/Settings/Account.php:505
  #, php-format
  msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
  msgstr ""
  
- #: src/Module/Settings/Account.php:550
 -#: src/Module/Settings/Account.php:516
++#: src/Module/Settings/Account.php:512
  msgid "Password Settings"
  msgstr ""
  
- #: src/Module/Settings/Account.php:552
 -#: src/Module/Settings/Account.php:518
++#: src/Module/Settings/Account.php:514
  msgid "Leave password fields blank unless changing"
  msgstr ""
  
- #: src/Module/Settings/Account.php:554
 -#: src/Module/Settings/Account.php:520
++#: src/Module/Settings/Account.php:516
  msgid "Password:"
  msgstr ""
  
- #: src/Module/Settings/Account.php:554
 -#: src/Module/Settings/Account.php:520
++#: src/Module/Settings/Account.php:516
  msgid "Your current password to confirm the changes of the email address"
  msgstr ""
  
- #: src/Module/Settings/Account.php:557
 -#: src/Module/Settings/Account.php:523
++#: src/Module/Settings/Account.php:519
  msgid "Delete OpenID URL"
  msgstr ""
  
- #: src/Module/Settings/Account.php:559
 -#: src/Module/Settings/Account.php:525
++#: src/Module/Settings/Account.php:521
  msgid "Basic Settings"
  msgstr ""
  
- #: src/Module/Settings/Account.php:560
 -#: src/Module/Settings/Account.php:526
++#: src/Module/Settings/Account.php:522
  #: src/Module/Settings/Profile/Index.php:274
  msgid "Display name:"
  msgstr ""
  
- #: src/Module/Settings/Account.php:561
 -#: src/Module/Settings/Account.php:527
++#: src/Module/Settings/Account.php:523
  msgid "Email Address:"
  msgstr ""
  
- #: src/Module/Settings/Account.php:562
 -#: src/Module/Settings/Account.php:528
++#: src/Module/Settings/Account.php:524
  msgid "Your Timezone:"
  msgstr ""
  
- #: src/Module/Settings/Account.php:563
 -#: src/Module/Settings/Account.php:529
++#: src/Module/Settings/Account.php:525
  msgid "Your Language:"
  msgstr ""
  
- #: src/Module/Settings/Account.php:563
 -#: src/Module/Settings/Account.php:529
++#: src/Module/Settings/Account.php:525
  msgid "Set the language we use to show you friendica interface and to send you emails"
  msgstr ""
  
- #: src/Module/Settings/Account.php:564
 -#: src/Module/Settings/Account.php:530
++#: src/Module/Settings/Account.php:526
  msgid "Default Post Location:"
  msgstr ""
  
- #: src/Module/Settings/Account.php:565
 -#: src/Module/Settings/Account.php:531
++#: src/Module/Settings/Account.php:527
  msgid "Use Browser Location:"
  msgstr ""
  
- #: src/Module/Settings/Account.php:567
 -#: src/Module/Settings/Account.php:533
++#: src/Module/Settings/Account.php:529
  msgid "Security and Privacy Settings"
  msgstr ""
  
- #: src/Module/Settings/Account.php:569
 -#: src/Module/Settings/Account.php:535
++#: src/Module/Settings/Account.php:531
  msgid "Maximum Friend Requests/Day:"
  msgstr ""
  
- #: src/Module/Settings/Account.php:569
 -#: src/Module/Settings/Account.php:535
++#: src/Module/Settings/Account.php:531
  msgid "(to prevent spam abuse)"
  msgstr ""
  
- #: src/Module/Settings/Account.php:571
 -#: src/Module/Settings/Account.php:537
++#: src/Module/Settings/Account.php:533
  msgid "Allow your profile to be searchable globally?"
  msgstr ""
  
- #: src/Module/Settings/Account.php:571
 -#: src/Module/Settings/Account.php:537
++#: src/Module/Settings/Account.php:533
  msgid "Activate this setting if you want others to easily find and follow you. Your profile will be searchable on remote systems. This setting also determines whether Friendica will inform search engines that your profile should be indexed or not."
  msgstr ""
  
- #: src/Module/Settings/Account.php:572
 -#: src/Module/Settings/Account.php:538
++#: src/Module/Settings/Account.php:534
  msgid "Hide your contact/friend list from viewers of your profile?"
  msgstr ""
  
- #: src/Module/Settings/Account.php:572
 -#: src/Module/Settings/Account.php:538
++#: src/Module/Settings/Account.php:534
  msgid "A list of your contacts is displayed on your profile page. Activate this option to disable the display of your contact list."
  msgstr ""
  
- #: src/Module/Settings/Account.php:573
 -#: src/Module/Settings/Account.php:539
++#: src/Module/Settings/Account.php:535
  msgid "Hide your public content from anonymous viewers"
  msgstr ""
  
- #: src/Module/Settings/Account.php:573
 -#: src/Module/Settings/Account.php:539
++#: src/Module/Settings/Account.php:535
  msgid "Anonymous visitors will only see your basic profile details. Your public posts and replies will still be freely accessible on the remote servers of your followers and through relays."
  msgstr ""
  
- #: src/Module/Settings/Account.php:574
 -#: src/Module/Settings/Account.php:540
++#: src/Module/Settings/Account.php:536
  msgid "Make public posts unlisted"
  msgstr ""
  
- #: src/Module/Settings/Account.php:574
 -#: src/Module/Settings/Account.php:540
++#: src/Module/Settings/Account.php:536
  msgid "Your public posts will not appear on the community pages or in search results, nor be sent to relay servers. However they can still appear on public feeds on remote servers."
  msgstr ""
  
- #: src/Module/Settings/Account.php:575
 -#: src/Module/Settings/Account.php:541
++#: src/Module/Settings/Account.php:537
  msgid "Make all posted pictures accessible"
  msgstr ""
  
- #: src/Module/Settings/Account.php:575
 -#: src/Module/Settings/Account.php:541
++#: src/Module/Settings/Account.php:537
  msgid "This option makes every posted picture accessible via the direct link. This is a workaround for the problem that most other networks can't handle permissions on pictures. Non public pictures still won't be visible for the public on your photo albums though."
  msgstr ""
  
- #: src/Module/Settings/Account.php:576
 -#: src/Module/Settings/Account.php:542
++#: src/Module/Settings/Account.php:538
  msgid "Allow friends to post to your profile page?"
  msgstr ""
  
- #: src/Module/Settings/Account.php:576
 -#: src/Module/Settings/Account.php:542
++#: src/Module/Settings/Account.php:538
  msgid "Your contacts may write posts on your profile wall. These posts will be distributed to your contacts"
  msgstr ""
  
- #: src/Module/Settings/Account.php:577
 -#: src/Module/Settings/Account.php:543
++#: src/Module/Settings/Account.php:539
  msgid "Allow friends to tag your posts?"
  msgstr ""
  
- #: src/Module/Settings/Account.php:577
 -#: src/Module/Settings/Account.php:543
++#: src/Module/Settings/Account.php:539
  msgid "Your contacts can add additional tags to your posts."
  msgstr ""
  
- #: src/Module/Settings/Account.php:578
 -#: src/Module/Settings/Account.php:544
++#: src/Module/Settings/Account.php:540
  msgid "Default privacy circle for new contacts"
  msgstr ""
  
- #: src/Module/Settings/Account.php:579
 -#: src/Module/Settings/Account.php:545
++#: src/Module/Settings/Account.php:541
  msgid "Default privacy circle for new group contacts"
  msgstr ""
  
- #: src/Module/Settings/Account.php:580
 -#: src/Module/Settings/Account.php:546
++#: src/Module/Settings/Account.php:542
  msgid "Default Post Permissions"
  msgstr ""
  
- #: src/Module/Settings/Account.php:584
 -#: src/Module/Settings/Account.php:550
++#: src/Module/Settings/Account.php:546
  msgid "Expiration settings"
  msgstr ""
  
- #: src/Module/Settings/Account.php:585
 -#: src/Module/Settings/Account.php:551
++#: src/Module/Settings/Account.php:547
  msgid "Automatically expire posts after this many days:"
  msgstr ""
  
- #: src/Module/Settings/Account.php:585
 -#: src/Module/Settings/Account.php:551
++#: src/Module/Settings/Account.php:547
  msgid "If empty, posts will not expire. Expired posts will be deleted"
  msgstr ""
  
- #: src/Module/Settings/Account.php:586
 -#: src/Module/Settings/Account.php:552
++#: src/Module/Settings/Account.php:548
  msgid "Expire posts"
  msgstr ""
  
- #: src/Module/Settings/Account.php:586
 -#: src/Module/Settings/Account.php:552
++#: src/Module/Settings/Account.php:548
  msgid "When activated, posts and comments will be expired."
  msgstr ""
  
- #: src/Module/Settings/Account.php:587
 -#: src/Module/Settings/Account.php:553
++#: src/Module/Settings/Account.php:549
  msgid "Expire personal notes"
  msgstr ""
  
- #: src/Module/Settings/Account.php:587
 -#: src/Module/Settings/Account.php:553
++#: src/Module/Settings/Account.php:549
  msgid "When activated, the personal notes on your profile page will be expired."
  msgstr ""
  
- #: src/Module/Settings/Account.php:588
 -#: src/Module/Settings/Account.php:554
++#: src/Module/Settings/Account.php:550
  msgid "Expire starred posts"
  msgstr ""
  
- #: src/Module/Settings/Account.php:588
 -#: src/Module/Settings/Account.php:554
++#: src/Module/Settings/Account.php:550
  msgid "Starring posts keeps them from being expired. That behaviour is overwritten by this setting."
  msgstr ""
  
- #: src/Module/Settings/Account.php:589
 -#: src/Module/Settings/Account.php:555
++#: src/Module/Settings/Account.php:551
  msgid "Only expire posts by others"
  msgstr ""
  
- #: src/Module/Settings/Account.php:589
 -#: src/Module/Settings/Account.php:555
++#: src/Module/Settings/Account.php:551
  msgid "When activated, your own posts never expire. Then the settings above are only valid for posts you received."
  msgstr ""
  
- #: src/Module/Settings/Account.php:592
 -#: src/Module/Settings/Account.php:558
++#: src/Module/Settings/Account.php:554
  msgid "Notification Settings"
  msgstr ""
  
- #: src/Module/Settings/Account.php:593
 -#: src/Module/Settings/Account.php:559
++#: src/Module/Settings/Account.php:555
  msgid "Send a notification email when:"
  msgstr ""
  
- #: src/Module/Settings/Account.php:594
 -#: src/Module/Settings/Account.php:560
++#: src/Module/Settings/Account.php:556
  msgid "You receive an introduction"
  msgstr ""
  
- #: src/Module/Settings/Account.php:595
 -#: src/Module/Settings/Account.php:561
++#: src/Module/Settings/Account.php:557
  msgid "Your introductions are confirmed"
  msgstr ""
  
- #: src/Module/Settings/Account.php:596
 -#: src/Module/Settings/Account.php:562
++#: src/Module/Settings/Account.php:558
  msgid "Someone writes on your profile wall"
  msgstr ""
  
- #: src/Module/Settings/Account.php:597
 -#: src/Module/Settings/Account.php:563
++#: src/Module/Settings/Account.php:559
  msgid "Someone writes a followup comment"
  msgstr ""
  
- #: src/Module/Settings/Account.php:598
 -#: src/Module/Settings/Account.php:564
++#: src/Module/Settings/Account.php:560
  msgid "You receive a private message"
  msgstr ""
  
- #: src/Module/Settings/Account.php:599
 -#: src/Module/Settings/Account.php:565
++#: src/Module/Settings/Account.php:561
  msgid "You receive a friend suggestion"
  msgstr ""
  
- #: src/Module/Settings/Account.php:600
 -#: src/Module/Settings/Account.php:566
++#: src/Module/Settings/Account.php:562
  msgid "You are tagged in a post"
  msgstr ""
  
- #: src/Module/Settings/Account.php:602
 -#: src/Module/Settings/Account.php:568
++#: src/Module/Settings/Account.php:564
  msgid "Create a desktop notification when:"
  msgstr ""
  
- #: src/Module/Settings/Account.php:603
 -#: src/Module/Settings/Account.php:569
++#: src/Module/Settings/Account.php:565
  msgid "Someone tagged you"
  msgstr ""
  
- #: src/Module/Settings/Account.php:604
 -#: src/Module/Settings/Account.php:570
++#: src/Module/Settings/Account.php:566
  msgid "Someone directly commented on your post"
  msgstr ""
  
- #: src/Module/Settings/Account.php:605
 -#: src/Module/Settings/Account.php:571
++#: src/Module/Settings/Account.php:567
  msgid "Someone liked your content"
  msgstr ""
  
- #: src/Module/Settings/Account.php:605 src/Module/Settings/Account.php:606
 -#: src/Module/Settings/Account.php:571 src/Module/Settings/Account.php:572
++#: src/Module/Settings/Account.php:567 src/Module/Settings/Account.php:568
  msgid "Can only be enabled, when the direct comment notification is enabled."
  msgstr ""
  
- #: src/Module/Settings/Account.php:606
 -#: src/Module/Settings/Account.php:572
++#: src/Module/Settings/Account.php:568
  msgid "Someone shared your content"
  msgstr ""
  
- #: src/Module/Settings/Account.php:607
 -#: src/Module/Settings/Account.php:573
++#: src/Module/Settings/Account.php:569
  msgid "Someone commented in your thread"
  msgstr ""
  
- #: src/Module/Settings/Account.php:608
 -#: src/Module/Settings/Account.php:574
++#: src/Module/Settings/Account.php:570
  msgid "Someone commented in a thread where you commented"
  msgstr ""
  
- #: src/Module/Settings/Account.php:609
 -#: src/Module/Settings/Account.php:575
++#: src/Module/Settings/Account.php:571
  msgid "Someone commented in a thread where you interacted"
  msgstr ""
  
- #: src/Module/Settings/Account.php:611
 -#: src/Module/Settings/Account.php:577
++#: src/Module/Settings/Account.php:573
  msgid "Activate desktop notifications"
  msgstr ""
  
- #: src/Module/Settings/Account.php:611
 -#: src/Module/Settings/Account.php:577
++#: src/Module/Settings/Account.php:573
  msgid "Show desktop popup on new notifications"
  msgstr ""
  
- #: src/Module/Settings/Account.php:615
 -#: src/Module/Settings/Account.php:581
++#: src/Module/Settings/Account.php:577
  msgid "Text-only notification emails"
  msgstr ""
  
- #: src/Module/Settings/Account.php:617
 -#: src/Module/Settings/Account.php:583
++#: src/Module/Settings/Account.php:579
  msgid "Send text only notification emails, without the html part"
  msgstr ""
  
- #: src/Module/Settings/Account.php:621
 -#: src/Module/Settings/Account.php:587
++#: src/Module/Settings/Account.php:583
  msgid "Show detailled notifications"
  msgstr ""
  
- #: src/Module/Settings/Account.php:623
 -#: src/Module/Settings/Account.php:589
++#: src/Module/Settings/Account.php:585
  msgid "Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed."
  msgstr ""
  
- #: src/Module/Settings/Account.php:627
 -#: src/Module/Settings/Account.php:593
++#: src/Module/Settings/Account.php:589
  msgid "Show notifications of ignored contacts"
  msgstr ""
  
- #: src/Module/Settings/Account.php:629
 -#: src/Module/Settings/Account.php:595
++#: src/Module/Settings/Account.php:591
  msgid "You don't see posts from ignored contacts. But you still see their comments. This setting controls if you want to still receive regular notifications that are caused by ignored contacts or not."
  msgstr ""
  
- #: src/Module/Settings/Account.php:632
 -#: src/Module/Settings/Account.php:598
++#: src/Module/Settings/Account.php:594
  msgid "Advanced Account/Page Type Settings"
  msgstr ""
  
- #: src/Module/Settings/Account.php:633
 -#: src/Module/Settings/Account.php:599
++#: src/Module/Settings/Account.php:595
  msgid "Change the behaviour of this account for special situations"
  msgstr ""
  
- #: src/Module/Settings/Account.php:636
- msgid "Import Contacts"
- msgstr ""
- 
- #: src/Module/Settings/Account.php:637
- msgid "Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account."
- msgstr ""
- 
- #: src/Module/Settings/Account.php:638
- msgid "Upload File"
- msgstr ""
- 
- #: src/Module/Settings/Account.php:641
 -#: src/Module/Settings/Account.php:602
++#: src/Module/Settings/Account.php:598
  msgid "Relocate"
  msgstr ""
  
- #: src/Module/Settings/Account.php:642
 -#: src/Module/Settings/Account.php:603
++#: src/Module/Settings/Account.php:599
  msgid "If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."
  msgstr ""
  
- #: src/Module/Settings/Account.php:643
 -#: src/Module/Settings/Account.php:604
++#: src/Module/Settings/Account.php:600
  msgid "Resend relocate message to contacts"
  msgstr ""