Merge remote-tracking branch 'origin/develop' into profile

This commit is contained in:
Michael 2021-07-23 13:29:36 +00:00
commit fae0f839bc
3 changed files with 10 additions and 9 deletions

View file

@ -864,7 +864,7 @@ msgstr ""
msgid "Access denied."
msgstr ""
#: mod/cal.php:72 mod/cal.php:133 src/Module/HoverCard.php:53
#: mod/cal.php:72 mod/cal.php:133 src/Module/HCard.php:54
#: src/Module/Profile/Common.php:41 src/Module/Profile/Common.php:53
#: src/Module/Profile/Contacts.php:40 src/Module/Profile/Contacts.php:51
#: src/Module/Profile/Status.php:58 src/Module/Register.php:254
@ -8208,6 +8208,10 @@ msgstr ""
msgid "Add contact to group"
msgstr ""
#: src/Module/HCard.php:48
msgid "No profile"
msgstr ""
#: src/Module/HTTPException/MethodNotAllowed.php:32
msgid "Method Not Allowed."
msgstr ""
@ -8221,10 +8225,6 @@ msgstr ""
msgid "Welcome to %s"
msgstr ""
#: src/Module/HoverCard.php:47
msgid "No profile"
msgstr ""
#: src/Module/Install.php:188
msgid "Friendica Communications Server - Setup"
msgstr ""