clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into oauth-flow

This commit is contained in:
Michael 2021-05-13 15:14:08 +00:00
parent 5219080149 31306f033f
commit a90a2bd05a
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
view/lang/C/messages.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2021.06-dev\n" "Project-Id-Version: 2021.06-dev\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-11 16:03-0400\n" "POT-Creation-Date: 2021-05-13 14:29+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -858,7 +858,7 @@ msgstr ""
msgid "Permission denied." msgid "Permission denied."
msgstr "" msgstr ""
#: mod/api.php:102 mod/api.php:124 #: mod/api.php:102 mod/api.php:124 src/Module/OAuth/Acknowledge.php:44
msgid "Authorize application connection" msgid "Authorize application connection"
msgstr "" msgstr ""
@ -870,19 +870,20 @@ msgstr ""
msgid "Please login to continue." msgid "Please login to continue."
msgstr "" msgstr ""
#: mod/api.php:126 #: mod/api.php:126 src/Module/OAuth/Acknowledge.php:46
msgid "" msgid ""
"Do you want to authorize this application to access your posts and contacts, " "Do you want to authorize this application to access your posts and contacts, "
"and/or create new posts for you?" "and/or create new posts for you?"
msgstr "" msgstr ""
#: mod/api.php:127 src/Module/Contact.php:464 #: mod/api.php:127 src/Module/Contact.php:464
#: src/Module/Notifications/Introductions.php:123 src/Module/Register.php:115 #: src/Module/Notifications/Introductions.php:123
#: src/Module/OAuth/Acknowledge.php:47 src/Module/Register.php:115
msgid "Yes" msgid "Yes"
msgstr "" msgstr ""
#: mod/api.php:128 src/Module/Notifications/Introductions.php:123 #: mod/api.php:128 src/Module/Notifications/Introductions.php:123
#: src/Module/Register.php:116 #: src/Module/OAuth/Acknowledge.php:48 src/Module/Register.php:116
msgid "No" msgid "No"
msgstr "" msgstr ""
@ -4579,6 +4580,20 @@ msgstr ""
msgid "Record not found" msgid "Record not found"
msgstr "" msgstr ""
#: src/Factory/Api/Mastodon/Error.php:41
msgid "Unprocessable Entity"
msgstr ""
#: src/Factory/Api/Mastodon/Error.php:50
#: src/Module/Special/HTTPException.php:50
msgid "Unauthorized"
msgstr ""
#: src/Factory/Api/Mastodon/Error.php:59
#: src/Module/Special/HTTPException.php:53
msgid "Internal Server Error"
msgstr ""
#: src/Factory/Notification/Introduction.php:135 #: src/Factory/Notification/Introduction.php:135
msgid "Friend Suggestion" msgid "Friend Suggestion"
msgstr "" msgstr ""
@ -7219,6 +7234,10 @@ msgstr ""
msgid "Deny" msgid "Deny"
msgstr "" msgstr ""
#: src/Module/Api/Mastodon/Apps.php:46
msgid "Missing parameters"
msgstr ""
#: src/Module/Api/Twitter/ContactEndpoint.php:65 src/Module/Contact.php:400 #: src/Module/Api/Twitter/ContactEndpoint.php:65 src/Module/Contact.php:400
msgid "Contact not found" msgid "Contact not found"
msgstr "" msgstr ""
@ -7321,12 +7340,12 @@ msgstr ""
msgid "User registrations waiting for confirmation" msgid "User registrations waiting for confirmation"
msgstr "" msgstr ""
#: src/Module/BaseApi.php:117 #: src/Module/BaseApi.php:123
#, php-format #, php-format
msgid "API endpoint %s %s is not implemented" msgid "API endpoint %s %s is not implemented"
msgstr "" msgstr ""
#: src/Module/BaseApi.php:118 #: src/Module/BaseApi.php:124
msgid "" msgid ""
"The API endpoint is currently not implemented but might be in the future." "The API endpoint is currently not implemented but might be in the future."
msgstr "" msgstr ""
@ -8865,6 +8884,10 @@ msgstr ""
msgid "Show all" msgid "Show all"
msgstr "" msgstr ""
#: src/Module/OAuth/Token.php:43
msgid "Unsupported or missing grant type"
msgstr ""
#: src/Module/PermissionTooltip.php:25 #: src/Module/PermissionTooltip.php:25
#, php-format #, php-format
msgid "Wrong type \"%s\", expected one of: %s" msgid "Wrong type \"%s\", expected one of: %s"
@ -9985,10 +10008,6 @@ msgstr ""
msgid "Bad Request" msgid "Bad Request"
msgstr "" msgstr ""
#: src/Module/Special/HTTPException.php:50
msgid "Unauthorized"
msgstr ""
#: src/Module/Special/HTTPException.php:51 #: src/Module/Special/HTTPException.php:51
msgid "Forbidden" msgid "Forbidden"
msgstr "" msgstr ""
@ -9997,10 +10016,6 @@ msgstr ""
msgid "Not Found" msgid "Not Found"
msgstr "" msgstr ""
#: src/Module/Special/HTTPException.php:53
msgid "Internal Server Error"
msgstr ""
#: src/Module/Special/HTTPException.php:54 #: src/Module/Special/HTTPException.php:54
msgid "Service Unavailable" msgid "Service Unavailable"
msgstr "" msgstr ""