Merge branch 'develop' into stable

Reviewed-on: AkkomaGang/akkoma#378

CHANGELOG.md

@@ -142,6 +142,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## 2022.08
 
+### Removed
+- Non-finch HTTP adapters. `:tesla, :adapter` is now highly recommended to be set to the default.
+
+## 2022.08
+
 ### Added
 - extended runtime module support, see config cheatsheet
 - quote posting; quotes are limited to public posts

config/description.exs

@@ -790,7 +790,7 @@
       %{
         key: :healthcheck,
         type: :boolean,
-        description: "If enabled, system data will be shown on `/api/v1/pleroma/healthcheck`"
+        description: "If enabled, system data will be shown on `/api/pleroma/healthcheck`"
       },
       %{
         key: :remote_post_retention_days,

docs/docs/administration/updating.md

@@ -26,7 +26,7 @@ su -s "$SHELL" akkoma
 # Run database migrations
 ./bin/pleroma_ctl migrate
 
-# Update frontend(s). See Frontend Configuration doc for more information.
+# Update Pleroma-FE frontend to latest stable. For other Frontends see Frontend Configration doc for more information.
 ./bin/pleroma_ctl frontend install pleroma-fe --ref stable
 
 # Start akkoma

lib/pleroma/formatter.ex

@@ -124,8 +124,8 @@ def mentions_escape(text, options \\ []) do
     end
   end
 
-  def markdown_to_html(text, opts \\ %{}) do
-    Earmark.as_html!(text, %Earmark.Options{compact_output: true} |> Map.merge(opts))
+  def markdown_to_html(text) do
+    Earmark.as_html!(text, %Earmark.Options{compact_output: true})
   end
 
   def html_escape({text, mentions, hashtags}, type) do

lib/pleroma/web/activity_pub/object_validators/article_note_page_validator.ex

@@ -104,9 +104,9 @@ defp remote_mention_resolver(
     end
   end
 
-  # See https://akkoma.dev/FoundKeyGang/FoundKey/issues/343
-  # Misskey/Foundkey drops some of the custom formatting when it sends remotely
-  # So this basically reprocesses the MFM source
+  # https://github.com/misskey-dev/misskey/pull/8787
+  # Misskey has an awful tendency to drop all custom formatting when it sends remotely
+  # So this basically reprocesses their MFM source
   defp fix_misskey_content(
          %{"source" => %{"mediaType" => "text/x.misskeymarkdown", "content" => content}} = object
        )
@@ -121,8 +121,6 @@ defp fix_misskey_content(
     Map.put(object, "content", linked)
   end
 
-  # See https://github.com/misskey-dev/misskey/pull/8787
-  # This is for compatibility with older Misskey instances
   defp fix_misskey_content(%{"_misskey_content" => content} = object) when is_binary(content) do
     mention_handler = fn nick, buffer, opts, acc ->
       remote_mention_resolver(object, nick, buffer, opts, acc)

lib/pleroma/web/common_api/utils.ex

@@ -289,7 +289,7 @@ def format_input(text, "text/html", options) do
 
   def format_input(text, "text/x.misskeymarkdown", options) do
     text
-    |> Formatter.markdown_to_html(%{breaks: true})
+    |> Formatter.markdown_to_html()
     |> MfmParser.Parser.parse()
     |> MfmParser.Encoder.to_html()
     |> Formatter.linkify(options)

priv/gettext/default.pot

@@ -10,266 +10,176 @@
 msgid ""
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:122
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:122
 msgid "%{name} - %{count} is not a multiple of %{multiple}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:131
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:131
 msgid "%{name} - %{value} is larger than exclusive maximum %{max}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:140
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:140
 msgid "%{name} - %{value} is larger than inclusive maximum %{max}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:149
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:149
 msgid "%{name} - %{value} is smaller than exclusive minimum %{min}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:158
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:158
 msgid "%{name} - %{value} is smaller than inclusive minimum %{min}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:102
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:102
 msgid "%{name} - Array items must be unique."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:114
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:114
 msgid "%{name} - Array length %{length} is larger than maxItems: %{}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:106
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:106
 msgid "%{name} - Array length %{length} is smaller than minItems: %{min}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:166
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:166
 msgid "%{name} - Invalid %{type}. Got: %{value}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:174
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:174
 msgid "%{name} - Invalid format. Expected %{format}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:51
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:51
 msgid "%{name} - Invalid schema.type. Got: %{type}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:178
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:178
 msgid "%{name} - Invalid value for enum."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:95
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:95
 msgid "%{name} - String length is larger than maxLength: %{length}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:88
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:88
 msgid "%{name} - String length is smaller than minLength: %{length}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:63
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:63
 msgid "%{name} - null value where %{type} expected."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:60
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:60
 msgid "%{name} - null value."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:182
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:182
 msgid "Failed to cast to any schema in %{polymorphic_type}"
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:71
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:71
 msgid "Failed to cast value as %{invalid_schema}. Value must be castable using `allOf` schemas listed."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:84
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:84
 msgid "Failed to cast value to one of: %{failed_schemas}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:78
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:78
 msgid "Failed to cast value using any of: %{failed_schemas}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:212
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:212
 msgid "Invalid value for header: %{name}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:204
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:204
 msgid "Missing field: %{name}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:208
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:208
 msgid "Missing header: %{name}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:196
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:196
 msgid "No value provided for required discriminator `%{field}`."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:216
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:216
 msgid "Object property count %{property_count} is greater than maxProperties: %{max_properties}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:224
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:224
 msgid "Object property count %{property_count} is less than minProperties: %{min_properties}"
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:188
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/static_fe/static_fe/error.html.eex:2
+msgid "Oops"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:188
 msgid "Unexpected field: %{name}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:200
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:200
 msgid "Unknown schema: %{name}."
 msgstr ""
 
-#: lib/pleroma/web/api_spec/render_error.ex:192
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/api_spec/render_error.ex:192
 msgid "Value used as discriminator for `%{field}` matches no schemas."
 msgstr ""
 
-#: lib/pleroma/web/templates/embed/show.html.eex:43
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/embed/show.html.eex:43
+#: lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex:37
 msgid "announces"
 msgstr ""
 
-#: lib/pleroma/web/templates/embed/show.html.eex:44
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/embed/show.html.eex:44
+#: lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex:38
 msgid "likes"
 msgstr ""
 
-#: lib/pleroma/web/templates/embed/show.html.eex:42
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/embed/show.html.eex:42
+#: lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex:36
 msgid "replies"
 msgstr ""
 
-#: lib/pleroma/web/templates/embed/show.html.eex:27
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/embed/show.html.eex:27
+#: lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex:22
 msgid "sensitive media"
 msgstr ""
-
-#: lib/pleroma/web/templates/layout/static_fe.html.eex:29
-#, elixir-autogen, elixir-format
-msgid "About %{instance}"
-msgstr ""
-
-#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:24
-#, elixir-autogen, elixir-format
-msgid "Admin"
-msgstr ""
-
-#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:30
-#, elixir-autogen, elixir-format
-msgid "Bot"
-msgstr ""
-
-#: lib/pleroma/web/templates/static_fe/static_fe/conversation.html.eex:3
-#, elixir-autogen, elixir-format
-msgid "Conversation"
-msgstr ""
-
-#: lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex:59
-#, elixir-autogen, elixir-format
-msgid "Edited %{timeago}"
-msgstr ""
-
-#: lib/pleroma/web/templates/static_fe/static_fe/error.html.eex:3
-#, elixir-autogen, elixir-format
-msgid "Error"
-msgstr ""
-
-#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:56
-#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:91
-#, elixir-autogen, elixir-format
-msgid "Followers"
-msgstr ""
-
-#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:52
-#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:84
-#, elixir-autogen, elixir-format
-msgid "Following"
-msgstr ""
-
-#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:53
-#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:57
-#, elixir-autogen, elixir-format
-msgid "Hidden"
-msgstr ""
-
-#: lib/pleroma/web/templates/static_fe/static_fe/_attachment.html.eex:4
-#, elixir-autogen, elixir-format
-msgid "Hover to show content"
-msgstr ""
-
-#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:97
-#, elixir-autogen, elixir-format
-msgid "Media"
-msgstr ""
-
-#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:27
-#, elixir-autogen, elixir-format
-msgid "Moderator"
-msgstr ""
-
-#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:48
-#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:73
-#, elixir-autogen, elixir-format
-msgid "Posts"
-msgstr ""
-
-#: lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex:46
-#, elixir-autogen, elixir-format
-msgid "Reply to"
-msgstr ""
-
-#: lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex:67
-#, elixir-autogen, elixir-format
-msgid "Show content"
-msgstr ""
-
-#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:102
-#, elixir-autogen, elixir-format
-msgid "Show newer"
-msgstr ""
-
-#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:140
-#, elixir-autogen, elixir-format
-msgid "Show older"
-msgstr ""
-
-#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:78
-#, elixir-autogen, elixir-format
-msgid "With Replies"
-msgstr ""
-
-#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:127
-#, elixir-autogen, elixir-format
-msgid "repeated"
-msgstr ""

priv/gettext/errors.pot

@@ -89,363 +89,376 @@ msgstr ""
 msgid "must be equal to %{number}"
 msgstr ""
 
-#: lib/pleroma/web/common_api.ex:503
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api.ex:523
 msgid "Account not found"
 msgstr ""
 
-#: lib/pleroma/web/common_api.ex:263
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api.ex:316
 msgid "Already voted"
 msgstr ""
 
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:427
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/o_auth/o_auth_controller.ex:402
 msgid "Bad request"
 msgstr ""
 
-#: lib/pleroma/web/controller_helper.ex:105
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/controller_helper.ex:97
+#: lib/pleroma/web/controller_helper.ex:103
 msgid "Can't display this activity"
 msgstr ""
 
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:334
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:325
 msgid "Can't find user"
 msgstr ""
 
-#: lib/pleroma/web/pleroma_api/controllers/account_controller.ex:61
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/pleroma_api/controllers/account_controller.ex:80
 msgid "Can't get favorites"
 msgstr ""
 
-#: lib/pleroma/web/common_api/utils.ex:473
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api/utils.ex:482
 msgid "Cannot post an empty status without attachments"
 msgstr ""
 
-#: lib/pleroma/web/common_api/utils.ex:461
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api/utils.ex:441
 msgid "Comment must be up to %{max_size} characters"
 msgstr ""
 
-#: lib/pleroma/config_db.ex:199
 #, elixir-autogen, elixir-format
+#: lib/pleroma/config_db.ex:200
 msgid "Config with params %{params} not found"
 msgstr ""
 
-#: lib/pleroma/web/common_api.ex:114
-#: lib/pleroma/web/common_api.ex:118
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api.ex:167
+#: lib/pleroma/web/common_api.ex:171
 msgid "Could not delete"
 msgstr ""
 
-#: lib/pleroma/web/common_api.ex:164
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api.ex:217
 msgid "Could not favorite"
 msgstr ""
 
-#: lib/pleroma/web/common_api.ex:201
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api.ex:254
 msgid "Could not unfavorite"
 msgstr ""
 
-#: lib/pleroma/web/common_api.ex:149
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api.ex:202
 msgid "Could not unrepeat"
 msgstr ""
 
-#: lib/pleroma/web/common_api.ex:510
-#: lib/pleroma/web/common_api.ex:519
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api.ex:530
+#: lib/pleroma/web/common_api.ex:539
 msgid "Could not update state"
 msgstr ""
 
-#: lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex:245
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex:205
 msgid "Error."
 msgstr ""
 
-#: lib/pleroma/web/twitter_api/twitter_api.ex:104
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/twitter_api/twitter_api.ex:105
 msgid "Invalid CAPTCHA"
 msgstr ""
 
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:143
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:660
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:144
+#: lib/pleroma/web/o_auth/o_auth_controller.ex:631
 msgid "Invalid credentials"
 msgstr ""
 
-#: lib/pleroma/web/plugs/ensure_authenticated_plug.ex:42
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/plugs/ensure_authenticated_plug.ex:42
 msgid "Invalid credentials."
 msgstr ""
 
-#: lib/pleroma/web/common_api.ex:284
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api.ex:337
 msgid "Invalid indices"
 msgstr ""
 
-#: lib/pleroma/web/admin_api/controllers/fallback_controller.ex:29
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/admin_api/controllers/fallback_controller.ex:29
 msgid "Invalid parameters"
 msgstr ""
 
-#: lib/pleroma/web/common_api/utils.ex:369
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api/utils.ex:349
 msgid "Invalid password."
 msgstr ""
 
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:264
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:255
 msgid "Invalid request"
 msgstr ""
 
-#: lib/pleroma/web/twitter_api/twitter_api.ex:107
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/twitter_api/twitter_api.ex:108
 msgid "Kocaptcha service unavailable"
 msgstr ""
 
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:139
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:140
 msgid "Missing parameters"
 msgstr ""
 
-#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:151
-#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:177
-#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:219
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api/utils.ex:477
+msgid "No such conversation"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:171
+#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:197
+#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:239
 msgid "No such permission_group"
 msgstr ""
 
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:502
+#, elixir-autogen, elixir-format
+#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:515
 #: lib/pleroma/web/admin_api/controllers/fallback_controller.ex:11
 #: lib/pleroma/web/feed/tag_controller.ex:16
-#: lib/pleroma/web/feed/user_controller.ex:70
-#: lib/pleroma/web/o_status/o_status_controller.ex:135
-#: lib/pleroma/web/plugs/uploaded_media.ex:83
-#, elixir-autogen, elixir-format
+#: lib/pleroma/web/feed/user_controller.ex:69
+#: lib/pleroma/web/o_status/o_status_controller.ex:132
+#: lib/pleroma/web/plugs/uploaded_media.ex:84
 msgid "Not found"
 msgstr ""
 
-#: lib/pleroma/web/common_api.ex:255
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api.ex:308
 msgid "Poll's author can't vote"
 msgstr ""
 
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:477
+#, elixir-autogen, elixir-format
 #: 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:51
 #: lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:52
+#: lib/pleroma/web/mastodon_api/controllers/status_controller.ex:326
 #: lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex:71
-#, elixir-autogen, elixir-format
 msgid "Record not found"
 msgstr ""
 
-#: lib/pleroma/web/admin_api/controllers/fallback_controller.ex:35
-#: lib/pleroma/web/feed/user_controller.ex:79
-#: lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:42
-#: lib/pleroma/web/o_status/o_status_controller.ex:141
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/admin_api/controllers/fallback_controller.ex:35
+#: lib/pleroma/web/feed/user_controller.ex:78
+#: lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:42
+#: lib/pleroma/web/o_status/o_status_controller.ex:138
 msgid "Something went wrong"
 msgstr ""
 
-#: lib/pleroma/web/common_api/activity_draft.ex:156
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api/activity_draft.ex:143
 msgid "The message visibility must be direct"
 msgstr ""
 
-#: lib/pleroma/web/common_api/utils.ex:483
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api/utils.ex:492
 msgid "The status is over the character limit"
 msgstr ""
 
-#: lib/pleroma/web/plugs/ensure_public_or_authenticated_plug.ex:36
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/plugs/ensure_public_or_authenticated_plug.ex:36
 msgid "This resource requires authentication."
 msgstr ""
 
-#: lib/pleroma/web/plugs/rate_limiter.ex:214
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/plugs/rate_limiter.ex:208
 msgid "Throttled"
 msgstr ""
 
-#: lib/pleroma/web/common_api.ex:285
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api.ex:338
 msgid "Too many choices"
 msgstr ""
 
-#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:248
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:268
 msgid "You can't revoke your own admin status."
 msgstr ""
 
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:267
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:358
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/o_auth/o_auth_controller.ex:243
+#: lib/pleroma/web/o_auth/o_auth_controller.ex:333
 msgid "Your account is currently disabled"
 msgstr ""
 
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:229
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:381
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/o_auth/o_auth_controller.ex:205
+#: lib/pleroma/web/o_auth/o_auth_controller.ex:356
 msgid "Your login is missing a confirmed e-mail address"
 msgstr ""
 
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:390
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:403
 msgid "can't read inbox of %{nickname} as %{as_nickname}"
 msgstr ""
 
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:489
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:502
 msgid "can't update outbox of %{nickname} as %{as_nickname}"
 msgstr ""
 
-#: lib/pleroma/web/common_api.ex:455
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api.ex:475
 msgid "conversation is already muted"
 msgstr ""
 
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:508
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:521
 msgid "error"
 msgstr ""
 
-#: lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex:34
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex:34
 msgid "mascots can only be images"
 msgstr ""
 
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:63
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:63
 msgid "not found"
 msgstr ""
 
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:462
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/o_auth/o_auth_controller.ex:437
 msgid "Bad OAuth request."
 msgstr ""
 
-#: lib/pleroma/web/twitter_api/twitter_api.ex:113
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/twitter_api/twitter_api.ex:114
 msgid "CAPTCHA already used"
 msgstr ""
 
-#: lib/pleroma/web/twitter_api/twitter_api.ex:110
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/twitter_api/twitter_api.ex:111
 msgid "CAPTCHA expired"
 msgstr ""
 
-#: lib/pleroma/web/plugs/uploaded_media.ex:56
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/plugs/uploaded_media.ex:57
 msgid "Failed"
 msgstr ""
 
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:478
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/o_auth/o_auth_controller.ex:453
 msgid "Failed to authenticate: %{message}."
 msgstr ""
 
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:509
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/o_auth/o_auth_controller.ex:484
 msgid "Failed to set up user account."
 msgstr ""
 
-#: lib/pleroma/web/plugs/o_auth_scopes_plug.ex:37
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/plugs/o_auth_scopes_plug.ex:37
 msgid "Insufficient permissions: %{permissions}."
 msgstr ""
 
-#: lib/pleroma/web/plugs/uploaded_media.ex:98
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/plugs/uploaded_media.ex:111
 msgid "Internal Error"
 msgstr ""
 
+#, elixir-autogen, elixir-format
 #: lib/pleroma/web/o_auth/fallback_controller.ex:22
 #: lib/pleroma/web/o_auth/fallback_controller.ex:29
-#, elixir-autogen, elixir-format
 msgid "Invalid Username/Password"
 msgstr ""
 
-#: lib/pleroma/web/twitter_api/twitter_api.ex:116
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/twitter_api/twitter_api.ex:117
 msgid "Invalid answer data"
 msgstr ""
 
-#: lib/pleroma/web/nodeinfo/nodeinfo_controller.ex:130
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/nodeinfo/nodeinfo_controller.ex:33
 msgid "Nodeinfo schema version not handled"
 msgstr ""
 
-#: lib/pleroma/web/o_auth/fallback_controller.ex:14
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/o_auth/o_auth_controller.ex:194
+msgid "This action is outside the authorized scopes"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/web/o_auth/fallback_controller.ex:14
 msgid "Unknown error, please check the details and try again."
 msgstr ""
 
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:158
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:204
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/o_auth/o_auth_controller.ex:136
+#: lib/pleroma/web/o_auth/o_auth_controller.ex:180
 msgid "Unlisted redirect_uri."
 msgstr ""
 
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:458
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/o_auth/o_auth_controller.ex:433
 msgid "Unsupported OAuth provider: %{provider}."
 msgstr ""
 
-#: lib/pleroma/uploaders/uploader.ex:74
 #, elixir-autogen, elixir-format
+#: lib/pleroma/uploaders/uploader.ex:74
 msgid "Uploader callback timeout"
 msgstr ""
 
-#: lib/pleroma/web/uploader_controller.ex:23
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/uploader_controller.ex:23
 msgid "bad request"
 msgstr ""
 
-#: lib/pleroma/web/twitter_api/twitter_api.ex:101
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/twitter_api/twitter_api.ex:102
 msgid "CAPTCHA Error"
 msgstr ""
 
-#: lib/pleroma/web/common_api.ex:213
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api.ex:266
 msgid "Could not add reaction emoji"
 msgstr ""
 
-#: lib/pleroma/web/common_api.ex:224
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api.ex:277
 msgid "Could not remove reaction emoji"
 msgstr ""
 
-#: lib/pleroma/web/twitter_api/twitter_api.ex:127
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/twitter_api/twitter_api.ex:128
 msgid "Invalid CAPTCHA (Missing parameter: %{name})"
 msgstr ""
 
-#: lib/pleroma/web/mastodon_api/controllers/list_controller.ex:96
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/mastodon_api/controllers/list_controller.ex:96
 msgid "List not found"
 msgstr ""
 
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:150
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:151
 msgid "Missing parameter: %{name}"
 msgstr ""
 
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:256
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:371
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/o_auth/o_auth_controller.ex:232
+#: lib/pleroma/web/o_auth/o_auth_controller.ex:346
 msgid "Password reset is required"
 msgstr ""
 
+#, elixir-autogen, elixir-format
 #: lib/pleroma/tests/auth_test_controller.ex:9
 #: lib/pleroma/web/activity_pub/activity_pub_controller.ex:6
 #: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:6
 #: lib/pleroma/web/admin_api/controllers/announcement_controller.ex:6
+#: lib/pleroma/web/admin_api/controllers/chat_controller.ex:6
 #: lib/pleroma/web/admin_api/controllers/config_controller.ex:6
 #: lib/pleroma/web/admin_api/controllers/fallback_controller.ex:6
 #: lib/pleroma/web/admin_api/controllers/frontend_controller.ex:6
@@ -458,9 +471,6 @@ msgstr ""
 #: lib/pleroma/web/admin_api/controllers/report_controller.ex:6
 #: lib/pleroma/web/admin_api/controllers/status_controller.ex:6
 #: lib/pleroma/web/admin_api/controllers/user_controller.ex:6
-#: lib/pleroma/web/akkoma_api/controllers/frontend_settings_controller.ex:2
-#: lib/pleroma/web/akkoma_api/controllers/metrics_controller.ex:2
-#: lib/pleroma/web/akkoma_api/controllers/translation_controller.ex:2
 #: lib/pleroma/web/controller_helper.ex:6
 #: lib/pleroma/web/embed_controller.ex:6
 #: lib/pleroma/web/fallback/redirect_controller.ex:6
@@ -468,7 +478,6 @@ msgstr ""
 #: lib/pleroma/web/feed/user_controller.ex:6
 #: lib/pleroma/web/mailer/subscription_controller.ex:6
 #: lib/pleroma/web/manifest_controller.ex:6
-#: lib/pleroma/web/masto_fe_controller.ex:6
 #: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:6
 #: lib/pleroma/web/mastodon_api/controllers/announcement_controller.ex:6
 #: lib/pleroma/web/mastodon_api/controllers/app_controller.ex:11
@@ -493,7 +502,6 @@ msgstr ""
 #: lib/pleroma/web/mastodon_api/controllers/status_controller.ex:6
 #: lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex:7
 #: lib/pleroma/web/mastodon_api/controllers/suggestion_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/tag_controller.ex:3
 #: lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex:6
 #: lib/pleroma/web/media_proxy/media_proxy_controller.ex:6
 #: lib/pleroma/web/mongoose_im/mongoose_im_controller.ex:6
@@ -505,6 +513,7 @@ msgstr ""
 #: lib/pleroma/web/pleroma_api/controllers/account_controller.ex:6
 #: lib/pleroma/web/pleroma_api/controllers/app_controller.ex:6
 #: lib/pleroma/web/pleroma_api/controllers/backup_controller.ex:6
+#: lib/pleroma/web/pleroma_api/controllers/chat_controller.ex:5
 #: lib/pleroma/web/pleroma_api/controllers/conversation_controller.ex:6
 #: lib/pleroma/web/pleroma_api/controllers/emoji_file_controller.ex:6
 #: lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex:6
@@ -513,6 +522,7 @@ msgstr ""
 #: lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex:6
 #: lib/pleroma/web/pleroma_api/controllers/notification_controller.ex:6
 #: lib/pleroma/web/pleroma_api/controllers/report_controller.ex:6
+#: lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex:6
 #: lib/pleroma/web/pleroma_api/controllers/two_factor_authentication_controller.ex:7
 #: lib/pleroma/web/pleroma_api/controllers/user_import_controller.ex:6
 #: lib/pleroma/web/static_fe/static_fe_controller.ex:6
@@ -522,99 +532,79 @@ msgstr ""
 #: lib/pleroma/web/twitter_api/controllers/util_controller.ex:6
 #: lib/pleroma/web/uploader_controller.ex:6
 #: lib/pleroma/web/web_finger/web_finger_controller.ex:6
-#, elixir-autogen, elixir-format
 msgid "Security violation: OAuth scopes check was neither handled nor explicitly skipped."
 msgstr ""
 
-#: lib/pleroma/web/plugs/ensure_authenticated_plug.ex:32
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/plugs/ensure_authenticated_plug.ex:32
 msgid "Two-factor authentication enabled, you must use a access token."
 msgstr ""
 
-#: lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex:61
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex:61
 msgid "Web push subscription is disabled on this Pleroma instance"
 msgstr ""
 
-#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:214
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:234
 msgid "You can't revoke your own admin/moderator status."
 msgstr ""
 
-#: lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex:169
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex:129
 msgid "authorization required for timeline view"
 msgstr ""
 
-#: lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:24
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:24
 msgid "Access denied"
 msgstr ""
 
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:331
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:322
 msgid "This API requires an authenticated user"
 msgstr ""
 
+#, elixir-autogen, elixir-format
 #: lib/pleroma/web/plugs/ensure_staff_privileged_plug.ex:26
 #: lib/pleroma/web/plugs/user_is_admin_plug.ex:21
-#, elixir-autogen, elixir-format
 msgid "User is not an admin."
 msgstr ""
 
-#: lib/pleroma/user/backup.ex:73
 #, elixir-format
+#: lib/pleroma/user/backup.ex:75
 msgid "Last export was less than a day ago"
 msgid_plural "Last export was less than %{days} days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:421
 #, elixir-autogen, elixir-format
+#: lib/pleroma/user/backup.ex:93
+msgid "Backups require enabled email"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:434
 msgid "Character limit (%{limit} characters) exceeded, contains %{length} characters"
 msgstr ""
 
+#, elixir-autogen, elixir-format
+#: lib/pleroma/user/backup.ex:98
+msgid "Email is required"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/web/common_api/utils.ex:507
+msgid "Too many attachments"
+msgstr ""
+
+#, elixir-autogen, elixir-format
 #: lib/pleroma/web/plugs/ensure_staff_privileged_plug.ex:33
 #: lib/pleroma/web/plugs/user_is_staff_plug.ex:20
-#, elixir-autogen, elixir-format
 msgid "User is not a staff member."
 msgstr ""
 
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:391
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/o_auth/o_auth_controller.ex:366
 msgid "Your account is awaiting approval."
 msgstr ""
-
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:255
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:258
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:261
-#, elixir-autogen, elixir-format
-msgid "File is too large"
-msgstr ""
-
-#: lib/pleroma/web/mastodon_api/controllers/tag_controller.ex:37
-#: lib/pleroma/web/mastodon_api/controllers/tag_controller.ex:48
-#: lib/pleroma/web/mastodon_api/controllers/tag_controller.ex:59
-#, elixir-autogen, elixir-format
-msgid "Hashtag not found"
-msgstr ""
-
-#: lib/pleroma/web/common_api/activity_draft.ex:144
-#, elixir-autogen, elixir-format
-msgid "Invalid language"
-msgstr ""
-
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:218
-#, elixir-autogen, elixir-format
-msgid "This action is outside of authorized scopes"
-msgstr ""
-
-#: lib/pleroma/web/common_api/activity_draft.ex:129
-#, elixir-autogen, elixir-format
-msgid "You can only quote public or unlisted statuses"
-msgstr ""
-
-#: lib/pleroma/web/common_api/activity_draft.ex:126
-#, elixir-autogen, elixir-format
-msgid "You can't quote a status that doesn't exist"
-msgstr ""

priv/gettext/static_pages.pot

@@ -10,553 +10,504 @@
 msgid ""
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex:9
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex:9
 msgctxt "remote follow authorization button"
 msgid "Authorize"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex:2
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex:2
 msgctxt "remote follow error"
 msgid "Error fetching user"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex:4
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex:4
 msgctxt "remote follow header"
 msgid "Remote follow"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_mfa.html.eex:8
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_mfa.html.eex:8
 msgctxt "placeholder text for auth code entry"
 msgid "Authentication code"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:10
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:10
 msgctxt "placeholder text for password entry"
 msgid "Password"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:8
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:8
 msgctxt "placeholder text for username entry"
 msgid "Username"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:13
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:13
 msgctxt "remote follow authorization button for login"
 msgid "Authorize"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_mfa.html.eex:12
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_mfa.html.eex:12
 msgctxt "remote follow authorization button for mfa"
 msgid "Authorize"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/remote_follow/followed.html.eex:2
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/remote_follow/followed.html.eex:2
 msgctxt "remote follow error"
 msgid "Error following account"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:4
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:4
 msgctxt "remote follow header, need login"
 msgid "Log in to follow"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_mfa.html.eex:4
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_mfa.html.eex:4
 msgctxt "remote follow mfa header"
 msgid "Two-factor authentication"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/remote_follow/followed.html.eex:4
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/remote_follow/followed.html.eex:4
 msgctxt "remote follow success"
 msgid "Account followed!"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex:7
-#: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:7
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:7
 msgctxt "placeholder text for account id"
 msgid "Your account ID, e.g. lain@quitter.se"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:8
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:8
 msgctxt "remote follow authorization button for following with a remote account"
 msgid "Follow"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:2
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:2
 msgctxt "remote follow error"
 msgid "Error: %{error}"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:4
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:4
 msgctxt "remote follow header"
 msgid "Remotely follow %{nickname}"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/password/reset.html.eex:12
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/password/reset.html.eex:12
 msgctxt "password reset button"
 msgid "Reset"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/password/reset_failed.html.eex:4
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/password/reset_failed.html.eex:4
 msgctxt "password reset failed homepage link"
 msgid "Homepage"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/password/reset_failed.html.eex:1
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/password/reset_failed.html.eex:1
 msgctxt "password reset failed message"
 msgid "Password reset failed"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/password/reset.html.eex:8
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/password/reset.html.eex:8
 msgctxt "password reset form confirm password prompt"
 msgid "Confirmation"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/password/reset.html.eex:4
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/password/reset.html.eex:4
 msgctxt "password reset form password prompt"
 msgid "Password"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/password/invalid_token.html.eex:1
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/password/invalid_token.html.eex:1
 msgctxt "password reset invalid token message"
 msgid "Invalid Token"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/password/reset_success.html.eex:2
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/password/reset_success.html.eex:2
 msgctxt "password reset successful homepage link"
 msgid "Homepage"
 msgstr ""
 
-#: lib/pleroma/web/templates/twitter_api/password/reset_success.html.eex:1
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/password/reset_success.html.eex:1
 msgctxt "password reset successful message"
 msgid "Password changed!"
 msgstr ""
 
+#, elixir-autogen, elixir-format
 #: lib/pleroma/web/templates/feed/feed/tag.atom.eex:15
 #: lib/pleroma/web/templates/feed/feed/tag.rss.eex:7
-#, elixir-autogen, elixir-format
 msgctxt "tag feed description"
 msgid "These are public toots tagged with #%{tag}. You can interact with them if you have an account anywhere in the fediverse."
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/oob_token_exists.html.eex:3
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/oob_token_exists.html.eex:1
 msgctxt "oauth authorization exists page title"
 msgid "Authorization exists"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:37
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:32
 msgctxt "oauth authorize approve button"
 msgid "Approve"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:35
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:30
 msgctxt "oauth authorize cancel button"
 msgid "Cancel"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:26
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:23
 msgctxt "oauth authorize message"
 msgid "Application <strong>%{client_name}</strong> is requesting access to your account."
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/oob_authorization_created.html.eex:3
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/oob_authorization_created.html.eex:1
 msgctxt "oauth authorized page title"
 msgid "Successfully authorized"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex:1
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex:1
 msgctxt "oauth external provider page title"
 msgid "Sign in with external provider"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex:13
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex:13
 msgctxt "oauth external provider sign in button"
 msgid "Sign in with %{strategy}"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:59
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:54
 msgctxt "oauth login button"
 msgid "Log In"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:56
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:51
 msgctxt "oauth login password prompt"
 msgid "Password"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:52
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:47
 msgctxt "oauth login username prompt"
 msgid "Username"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:44
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:39
 msgctxt "oauth register nickname prompt"
 msgid "Pleroma Handle"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:42
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:37
 msgctxt "oauth register nickname unchangeable warning"
 msgid "Choose carefully! You won't be able to change this later. You will be able to change your display name, though."
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:18
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:18
 msgctxt "oauth register page email prompt"
 msgid "Email"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:10
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:10
 msgctxt "oauth register page fill form prompt"
 msgid "If you'd like to register a new account, please provide the details below."
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:35
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:35
 msgctxt "oauth register page login button"
 msgid "Proceed as existing user"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:31
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:31
 msgctxt "oauth register page login password prompt"
 msgid "Password"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:24
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:24
 msgctxt "oauth register page login prompt"
 msgid "Alternatively, sign in to connect to existing account."
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:27
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:27
 msgctxt "oauth register page login username prompt"
 msgid "Name or email"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:14
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:14
 msgctxt "oauth register page nickname prompt"
 msgid "Nickname"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:22
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:22
 msgctxt "oauth register page register button"
 msgid "Proceed as new user"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:8
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:8
 msgctxt "oauth register page title"
 msgid "Registration Details"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/_scopes.html.eex:2
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:36
+msgctxt "oauth register page title"
+msgid "This is the first time you visit! Please enter your Pleroma handle."
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/_scopes.html.eex:2
 msgctxt "oauth scopes message"
 msgid "The following permissions will be granted"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/o_auth/oob_authorization_created.html.eex:6
-#: lib/pleroma/web/templates/o_auth/o_auth/oob_token_exists.html.eex:6
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/o_auth/oob_authorization_created.html.eex:2
+#: lib/pleroma/web/templates/o_auth/o_auth/oob_token_exists.html.eex:2
 msgctxt "oauth token code message"
 msgid "Token code is <br>%{token}"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:14
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:12
 msgctxt "mfa auth code prompt"
 msgid "Authentication code"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:9
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:8
 msgctxt "mfa auth page title"
 msgid "Two-factor authentication"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:25
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:23
 msgctxt "mfa auth page use recovery code link"
 msgid "Enter a two-factor recovery code"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:22
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:20
 msgctxt "mfa auth verify code button"
 msgid "Verify"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:9
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:8
 msgctxt "mfa recover page title"
 msgid "Two-factor recovery"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:14
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:12
 msgctxt "mfa recover recovery code prompt"
 msgid "Recovery code"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:25
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:23
 msgctxt "mfa recover use 2fa code link"
 msgid "Enter a two-factor code"
 msgstr ""
 
-#: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:22
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:20
 msgctxt "mfa recover verify recovery code button"
 msgid "Verify"
 msgstr ""
 
-#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:42
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:8
 msgctxt "static fe profile page remote follow button"
 msgid "Remote follow"
 msgstr ""
 
-#: lib/pleroma/web/templates/email/digest.html.eex:163
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/email/digest.html.eex:163
 msgctxt "digest email header line"
 msgid "Hey %{nickname}, here is what you've missed!"
 msgstr ""
 
-#: lib/pleroma/web/templates/email/digest.html.eex:544
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/email/digest.html.eex:544
 msgctxt "digest email receiver address"
 msgid "The email address you are subscribed as is <a href='mailto:%{@user.email}' style='color: %{color};text-decoration: none;'>%{email}</a>. "
 msgstr ""
 
-#: lib/pleroma/web/templates/email/digest.html.eex:538
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/email/digest.html.eex:538
 msgctxt "digest email sending reason"
 msgid "You have received this email because you have signed up to receive digest emails from <b>%{instance}</b> Pleroma instance."
 msgstr ""
 
-#: lib/pleroma/web/templates/email/digest.html.eex:547
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/email/digest.html.eex:547
 msgctxt "digest email unsubscribe action"
 msgid "To unsubscribe, please go %{here}."
 msgstr ""
 
-#: lib/pleroma/web/templates/email/digest.html.eex:547
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/email/digest.html.eex:547
 msgctxt "digest email unsubscribe action link text"
 msgid "here"
 msgstr ""
 
-#: lib/pleroma/web/templates/mailer/subscription/unsubscribe_failure.html.eex:1
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/mailer/subscription/unsubscribe_failure.html.eex:1
 msgctxt "mailer unsubscribe failed message"
 msgid "UNSUBSCRIBE FAILURE"
 msgstr ""
 
-#: lib/pleroma/web/templates/mailer/subscription/unsubscribe_success.html.eex:1
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/mailer/subscription/unsubscribe_success.html.eex:1
 msgctxt "mailer unsubscribe successful message"
 msgid "UNSUBSCRIBE SUCCESSFUL"
 msgstr ""
 
-#: lib/pleroma/web/templates/email/digest.html.eex:385
 #, elixir-format
+#: lib/pleroma/web/templates/email/digest.html.eex:385
 msgctxt "new followers count header"
 msgid "%{count} New Follower"
 msgid_plural "%{count} New Followers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/pleroma/emails/user_email.ex:384
 #, elixir-autogen, elixir-format
+#: lib/pleroma/emails/user_email.ex:356
+msgctxt "account archive email body - self-requested"
+msgid "<p>You requested a full backup of your Pleroma account. It's ready for download:</p>\n<p><a href=\"%{download_url}\">%{download_url}</a></p>\n"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/emails/user_email.ex:384
 msgctxt "account archive email subject"
 msgid "Your account archive is ready"
 msgstr ""
 
-#: lib/pleroma/emails/user_email.ex:188
 #, elixir-autogen, elixir-format
+#: lib/pleroma/emails/user_email.ex:188
 msgctxt "approval pending email body"
 msgid "<h3>Awaiting Approval</h3>\n<p>Your account at %{instance_name} is being reviewed by staff. You will receive another email once your account is approved.</p>\n"
 msgstr ""
 
-#: lib/pleroma/emails/user_email.ex:202
 #, elixir-autogen, elixir-format
+#: lib/pleroma/emails/user_email.ex:202
 msgctxt "approval pending email subject"
 msgid "Your account is awaiting approval"
 msgstr ""
 
-#: lib/pleroma/emails/user_email.ex:158
 #, elixir-autogen, elixir-format
+#: lib/pleroma/emails/user_email.ex:158
 msgctxt "confirmation email body"
 msgid "<h3>Thank you for registering on %{instance_name}</h3>\n<p>Email confirmation is required to activate the account.</p>\n<p>Please click the following link to <a href=\"%{confirmation_url}\">activate your account</a>.</p>\n"
 msgstr ""
 
-#: lib/pleroma/emails/user_email.ex:174
 #, elixir-autogen, elixir-format
+#: lib/pleroma/emails/user_email.ex:174
 msgctxt "confirmation email subject"
 msgid "%{instance_name} account confirmation"
 msgstr ""
 
-#: lib/pleroma/emails/user_email.ex:310
 #, elixir-autogen, elixir-format
+#: lib/pleroma/emails/user_email.ex:310
 msgctxt "digest email subject"
 msgid "Your digest from %{instance_name}"
 msgstr ""
 
-#: lib/pleroma/emails/user_email.ex:81
 #, elixir-autogen, elixir-format
+#: lib/pleroma/emails/user_email.ex:81
 msgctxt "password reset email body"
 msgid "<h3>Reset your password at %{instance_name}</h3>\n<p>Someone has requested password change for your account at %{instance_name}.</p>\n<p>If it was you, visit the following link to proceed: <a href=\"%{password_reset_url}\">reset password</a>.</p>\n<p>If it was someone else, nothing to worry about: your data is secure and your password has not been changed.</p>\n"
 msgstr ""
 
-#: lib/pleroma/emails/user_email.ex:98
 #, elixir-autogen, elixir-format
+#: lib/pleroma/emails/user_email.ex:98
 msgctxt "password reset email subject"
 msgid "Password reset"
 msgstr ""
 
-#: lib/pleroma/emails/user_email.ex:215
 #, elixir-autogen, elixir-format
+#: lib/pleroma/emails/user_email.ex:215
 msgctxt "successful registration email body"
 msgid "<h3>Hello @%{nickname},</h3>\n<p>Your account at %{instance_name} has been registered successfully.</p>\n<p>No further action is required to activate your account.</p>\n"
 msgstr ""
 
-#: lib/pleroma/emails/user_email.ex:231
 #, elixir-autogen, elixir-format
+#: lib/pleroma/emails/user_email.ex:231
 msgctxt "successful registration email subject"
 msgid "Account registered on %{instance_name}"
 msgstr ""
 
-#: lib/pleroma/emails/user_email.ex:136
 #, elixir-autogen, elixir-format
+#: lib/pleroma/emails/user_email.ex:119
+msgctxt "user invitation email body"
+msgid "<h3>You are invited to %{instance_name}</h3>\n<p>%{inviter_name} invites you to join %{instance_name}, an instance of Pleroma federated social networking platform.</p>\n<p>Click the following link to register: <a href=\"%{registration_url}\">accept invitation</a>.</p>\n"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/emails/user_email.ex:136
 msgctxt "user invitation email subject"
 msgid "Invitation to %{instance_name}"
 msgstr ""
 
-#: lib/pleroma/emails/user_email.ex:53
 #, elixir-autogen, elixir-format
+#: lib/pleroma/emails/user_email.ex:53
 msgctxt "welcome email html body"
 msgid "Welcome to %{instance_name}!"
 msgstr ""
 
-#: lib/pleroma/emails/user_email.ex:41
 #, elixir-autogen, elixir-format
+#: lib/pleroma/emails/user_email.ex:41
 msgctxt "welcome email subject"
 msgid "Welcome to %{instance_name}!"
 msgstr ""
 
-#: lib/pleroma/emails/user_email.ex:65
 #, elixir-autogen, elixir-format
+#: lib/pleroma/emails/user_email.ex:65
 msgctxt "welcome email text body"
 msgid "Welcome to %{instance_name}!"
 msgstr ""
 
+#, elixir-autogen, elixir-format
 #: lib/pleroma/emails/user_email.ex:368
-#, elixir-autogen, elixir-format
 msgctxt "account archive email body - admin requested"
-msgid "<p>Admin @%{admin_nickname} requested a full backup of your Akkoma account. It's ready for download:</p>\n<p><a href=\"%{download_url}\">%{download_url}</a></p>\n"
-msgstr ""
-
-#: lib/pleroma/emails/user_email.ex:356
-#, elixir-autogen, elixir-format
-msgctxt "account archive email body - self-requested"
-msgid "<p>You requested a full backup of your Akkoma account. It's ready for download:</p>\n<p><a href=\"%{download_url}\">%{download_url}</a></p>\n"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:41
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page title"
-msgid "This is your first visit! Please enter your Akkoma handle."
-msgstr ""
-
-#: lib/pleroma/web/twitter_api/controllers/util_controller.ex:123
-#, elixir-autogen, elixir-format
-msgctxt "remote follow error message - unknown error"
-msgid "Something went wrong."
-msgstr ""
-
-#: lib/pleroma/web/twitter_api/controllers/util_controller.ex:67
-#, elixir-autogen, elixir-format
-msgctxt "remote follow error message - user not found"
-msgid "Could not find user"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex:8
-#, elixir-autogen, elixir-format
-msgctxt "status interact authorization button"
-msgid "Interact"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex:2
-#, elixir-autogen, elixir-format
-msgctxt "status interact error"
-msgid "Error: %{error}"
-msgstr ""
-
-#: lib/pleroma/web/twitter_api/controllers/util_controller.ex:95
-#, elixir-autogen, elixir-format
-msgctxt "status interact error message - status not found"
-msgid "Could not find status"
-msgstr ""
-
-#: lib/pleroma/web/twitter_api/controllers/util_controller.ex:144
-#, elixir-autogen, elixir-format
-msgctxt "status interact error message - unknown error"
-msgid "Something went wrong."
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex:4
-#, elixir-autogen, elixir-format
-msgctxt "status interact header"
-msgid "Interacting with %{nickname}'s %{status_link}"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex:4
-#, elixir-autogen, elixir-format
-msgctxt "status interact header - status link text"
-msgid "status"
-msgstr ""
-
-#: lib/pleroma/emails/user_email.ex:119
-#, elixir-autogen, elixir-format
-msgctxt "user invitation email body"
-msgid "<h3>You are invited to %{instance_name}</h3>\n<p>%{inviter_name} invites you to join %{instance_name}, an instance of Akkoma federated social networking platform.</p>\n<p>Click the following link to register: <a href=\"%{registration_url}\">accept invitation</a>.</p>\n"
+msgid "<p>Admin @%{admin_nickname} requested a full backup of your Pleroma account. It's ready for download:</p>\n<p><a href=\"%{download_url}\">%{download_url}</a></p>\n"
 msgstr ""

test/fixtures/misskey/mfm_x_format.json

@@ -5,7 +5,7 @@
   "summary": null,
   "content": "this does not get replaced",
   "source": {
-    "content": "@akkoma_user @remote_user @full_tag_remote_user@misskey.local.live @oops_not_a_mention linkifylink #dancedance $[jelly mfm goes here] \n\n## aaa\n\nsome text\nnewline",
+    "content": "@akkoma_user @remote_user @full_tag_remote_user@misskey.local.live @oops_not_a_mention linkifylink #dancedance $[jelly mfm goes here] \n\n## aaa",
     "mediaType": "text/x.misskeymarkdown"
   },
   "published": "2022-07-10T15:37:36.368Z",

test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs

@@ -136,8 +136,6 @@ test "a misskey MFM status with a content field should work and be linked", _ do
 
       assert content =~
                "<span class=\"mfm _mfm_jelly_\" style=\"display: inline-block; animation: 1s linear 0s infinite normal both running mfm-rubberBand;\">mfm goes here</span> </p>aaa"
-
-      assert content =~ "some text<br/>newline"
     end
 
     test "a misskey MFM status with a _misskey_content field should work and be linked", _ do