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

- `.env.production.sample`:
  Our sample config file is very different from upstream since it is much more
  complete. Upstream added documentation for a few env variables.
  Copied the new variables/documentation from upstream.
- `app/lib/feed_manager.rb`:
  Upstream added a timeline type (hashtags), while glitch-soc already had an
  extra one (direct messages). Not really a conflict but textually close
  changes.
  Ported upstream's changes.
- `app/models/custom_emoji.rb`:
  Upstream upped the custom emoji size limit, while glitch-soc had configurable
  limits.
  Upped the default limits accordingly.
- `streaming/index.js`:
  Upstream reworked how hastags were normalized. Minor conflict due to
  glitch-soc's handling of instance-local posts.
  Ported upstream's changes.

1 files changed, 0 insertions, 6 deletions

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 8a280c001..19a67a8ec 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -11,7 +11,6 @@ ga:
     roles:
       bot: Róbat
       group: Grúpa
-      moderator: Modhnóir
     unfollow: Ná lean
   admin:
     accounts:
@@ -27,11 +26,6 @@ ga:
         all: Uile
       public: Poiblí
       reject: Diúltaigh
-      roles:
-        admin: Riarthóir
-        moderator: Modhnóir
-        staff: Foireann
-        user: Úsáideoir
       search: Cuardaigh
       statuses: Postálacha
       title: Cuntais