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

Conflicts:
- `app/controllers/home_controller.rb`:
  Upstream made it so `/web` is available to non-logged-in users
  and `/` redirects to `/web` instead of `/about`.
  Kept our version since glitch-soc's WebUI doesn't have what's
  needed yet and I think /about is still a much better landing
  page anyway.
- `app/models/form/admin_settings.rb`:
  Upstream added new settings, and glitch-soc had an extra setting.
  Not really a conflict.
  Added upstream's new settings.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a new `server` initial state object.
  Not really a conflict.
  Merged upstream's changes.
- `app/views/admin/settings/edit.html.haml`:
  Upstream added new settings.
  Not really a conflict.
  Merged upstream's changes.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Upstream refactored that part and removed the file.
  Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb`
- `config/settings.yml`:
  Upstream added new settings.
  Not a real conflict.
  Added upstream's new settings.

1 files changed, 0 insertions, 3 deletions

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 61e85d163..0e9b9d1ee 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -9,7 +9,6 @@ br:
     contact: Darempred
     discover_users: Dizoleiñ implijer·ien·ezed
     learn_more: Gouzout hiroc'h
-    privacy_policy: Reolennoù prevezded
     rules: Reolennoù ar servijer
     server_stats: 'Stadegoù ar servijer:'
     source_code: Boneg tarzh
@@ -19,7 +18,6 @@ br:
       one: toud
       other: toud
       two: toud
-    terms: Divizoù gwerzhañ hollek
     unavailable_content_description:
       domain: Dafariad
     user_count_after:
@@ -89,7 +87,6 @@ br:
     action_logs:
       action_types:
         destroy_status: Dilemel ar statud
-      deleted_status: "(statud dilemet)"
     announcements:
       new:
         create: Sevel ur gemenn