sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into neckbeard

This commit is contained in:
Your New SJW Waifu 2022-10-14 12:54:22 -05:00
parent a7f0d18a00 c830282628
commit fbf7cf5706
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
priv/gettext/errors.pot
View File

@ -111,7 +111,7 @@ msgid "Can't display this activity"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:325 #: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:327
msgid "Can't find user" msgid "Can't find user"
msgstr "" msgstr ""
@ -173,7 +173,7 @@ msgid "Invalid CAPTCHA"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:144 #: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:146
#: lib/pleroma/web/o_auth/o_auth_controller.ex:631 #: lib/pleroma/web/o_auth/o_auth_controller.ex:631
msgid "Invalid credentials" msgid "Invalid credentials"
msgstr "" msgstr ""
@ -199,7 +199,7 @@ msgid "Invalid password."
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:255 #: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:257
msgid "Invalid request" msgid "Invalid request"
msgstr "" msgstr ""
@ -209,7 +209,7 @@ msgid "Kocaptcha service unavailable"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:140 #: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:142
msgid "Missing parameters" msgid "Missing parameters"
msgstr "" msgstr ""
@ -236,6 +236,7 @@ msgid "Poll's author can't vote"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:492
#: lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:20 #: lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:20
#: lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:39 #: lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:39
#: lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:51 #: lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:51
@ -438,7 +439,7 @@ msgid "List not found"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:151 #: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:153
msgid "Missing parameter: %{name}" msgid "Missing parameter: %{name}"
msgstr "" msgstr ""
@ -557,7 +558,7 @@ msgid "Access denied"
msgstr "" msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:322 #: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:324
msgid "This API requires an authenticated user" msgid "This API requires an authenticated user"
msgstr "" msgstr ""