Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/models/account.rb`:
  Conflict because we (glitch-soc) have disabled trending of posts without
  review.
  Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
  Just an extra setting in glitch-soc.
  Kept that extra setting.

1 files changed, 9 insertions, 1 deletions

diff --git a/config/locales/af.yml b/config/locales/af.yml
index ac4a09b34..72b1b3c08 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -32,6 +32,7 @@ af:
         title: Aangaande
     statuses:
       favourites: Gunstelinge
+      in_reply_to: Reaksie op
     strikes:
       actions:
         silence: "%{name} het %{target} se rekening beperk"
@@ -73,7 +74,7 @@ af:
       reject_appeal: Verwerp appêl
   errors:
     '400': The request you submitted was invalid or malformed.
-    '403': You don't have permission to view this page.
+    '403': Jy het nie toestemming om hierdie bladsy te besigtig nie.
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
@@ -86,8 +87,13 @@ af:
   imports:
     types:
       bookmarks: Boekmerke
+  login_activities:
+    description_html: Indien jy onbekende aktiwiteite gewaar, oorweeg dit om jou wagwoord te verander en twee-faktor verifikasie te aktiveer.
   navigation:
     toggle_menu: Skakel-kieslys
+  notification_mailer:
+    mention:
+      action: Reageer
   number:
     human:
       decimal_units:
@@ -108,6 +114,8 @@ af:
     preferences: Voorkeure
   statuses:
     content_warning: 'Inhoud waarskuwing: %{warning}'
+    errors:
+      in_reply_not_found: Die plasing waarop jy probeer reageer blyk nie te bestaan nie.
   statuses_cleanup:
     ignore_favs: Ignoreer gunstelinge
   strikes: