Merge remote-tracking branch 'upstream/develop' into contact-media

diff --cc src/Model/Contact.php
Simple merge

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

diff --cc view/lang/C/messages.po
index add9d07728419ed2b9b1e599fba2bbb52bad7a69,db44dde0c3cf416c05d17fc9dbce70efeb4e863c..51996037c65772a8e986562667bfdd8da11ad8ca
--- 1/view/lang/C/messages.po
--- 2/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: 2021.12-dev\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2021-10-02 14:25+0000\n"
 -"POT-Creation-Date: 2021-10-02 08:34-0400\n"
++"POT-Creation-Date: 2021-10-02 15:13+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"
@@@ -2289,6 -2290,40 +2289,24 @@@ msgstr "
  msgid "Disconnect/Unfollow"
  msgstr ""
  
 -#: mod/videos.php:120
 -msgid "No videos selected"
 -msgstr ""
 -
 -#: mod/videos.php:236
 -msgid "View Video"
 -msgstr ""
 -
 -#: mod/videos.php:251
 -msgid "Recent Videos"
 -msgstr ""
 -
 -#: mod/videos.php:253
 -msgid "Upload New Videos"
 -msgstr ""
 -
+ #: mod/unfollow.php:149
+ msgid "Unfollowing is currently not supported by this contact's network."
+ msgstr ""
+ 
+ #: mod/unfollow.php:153
+ msgid ""
+ "Unable to unfollow this contact, please retry in a few minutes or contact "
+ "your administrator."
+ msgstr ""
+ 
+ #: mod/unfollow.php:157
+ msgid "Contact was successfully unfollowed"
+ msgstr ""
+ 
+ #: mod/unfollow.php:161
+ msgid "Unable to unfollow this contact, please contact your administrator"
+ msgstr ""
+ 
  #: mod/wall_attach.php:42 mod/wall_attach.php:49 mod/wall_attach.php:87
  #: mod/wall_upload.php:52 mod/wall_upload.php:63 mod/wall_upload.php:108
  #: mod/wall_upload.php:159 mod/wall_upload.php:162
@@@ -3482,7 -3517,7 +3500,7 @@@ msgstr "
  msgid "Organisations"
  msgstr ""
  
- #: src/Content/Widget.php:529 src/Model/Contact.php:1487
 -#: src/Content/Widget.php:529 src/Model/Contact.php:1474
++#: src/Content/Widget.php:529 src/Model/Contact.php:1481
  msgid "News"
  msgstr ""
  
@@@ -4360,71 -4395,71 +4378,71 @@@ msgstr "
  msgid "Approve"
  msgstr ""
  
- #: src/Model/Contact.php:1483
 -#: src/Model/Contact.php:1470
++#: src/Model/Contact.php:1477
  msgid "Organisation"
  msgstr ""
  
- #: src/Model/Contact.php:1491
 -#: src/Model/Contact.php:1478
++#: src/Model/Contact.php:1485
  msgid "Forum"
  msgstr ""
  
- #: src/Model/Contact.php:2347
 -#: src/Model/Contact.php:2334
++#: src/Model/Contact.php:2341
  msgid "Disallowed profile URL."
  msgstr ""
  
- #: src/Model/Contact.php:2352 src/Module/Friendica.php:81
 -#: src/Model/Contact.php:2339 src/Module/Friendica.php:81
++#: src/Model/Contact.php:2346 src/Module/Friendica.php:81
  msgid "Blocked domain"
  msgstr ""
  
- #: src/Model/Contact.php:2357
 -#: src/Model/Contact.php:2344
++#: src/Model/Contact.php:2351
  msgid "Connect URL missing."
  msgstr ""
  
- #: src/Model/Contact.php:2366
 -#: src/Model/Contact.php:2353
++#: src/Model/Contact.php:2360
  msgid ""
  "The contact could not be added. Please check the relevant network "
  "credentials in your Settings -> Social Networks page."
  msgstr ""
  
- #: src/Model/Contact.php:2403
 -#: src/Model/Contact.php:2390
++#: src/Model/Contact.php:2397
  msgid "The profile address specified does not provide adequate information."
  msgstr ""
  
- #: src/Model/Contact.php:2405
 -#: src/Model/Contact.php:2392
++#: src/Model/Contact.php:2399
  msgid "No compatible communication protocols or feeds were discovered."
  msgstr ""
  
- #: src/Model/Contact.php:2408
 -#: src/Model/Contact.php:2395
++#: src/Model/Contact.php:2402
  msgid "An author or name was not found."
  msgstr ""
  
- #: src/Model/Contact.php:2411
 -#: src/Model/Contact.php:2398
++#: src/Model/Contact.php:2405
  msgid "No browser URL could be matched to this address."
  msgstr ""
  
- #: src/Model/Contact.php:2414
 -#: src/Model/Contact.php:2401
++#: src/Model/Contact.php:2408
  msgid ""
  "Unable to match @-style Identity Address with a known protocol or email "
  "contact."
  msgstr ""
  
- #: src/Model/Contact.php:2415
 -#: src/Model/Contact.php:2402
++#: src/Model/Contact.php:2409
  msgid "Use mailto: in front of address to force email check."
  msgstr ""
  
- #: src/Model/Contact.php:2421
 -#: src/Model/Contact.php:2408
++#: src/Model/Contact.php:2415
  msgid ""
  "The profile address specified belongs to a network which has been disabled "
  "on this site."
  msgstr ""
  
- #: src/Model/Contact.php:2426
 -#: src/Model/Contact.php:2413
++#: src/Model/Contact.php:2420
  msgid ""
  "Limited profile. This person will be unable to receive direct/personal "
  "notifications from you."
  msgstr ""
  
- #: src/Model/Contact.php:2485
 -#: src/Model/Contact.php:2472
++#: src/Model/Contact.php:2479
  msgid "Unable to retrieve contact information."
  msgstr ""