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, 12 deletions

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 0db4e1c9d..4fac9a796 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -63,10 +63,8 @@ kab:
     posts_tab_heading: Tijewwiqin
     posts_with_replies: Tijewwaqin akked tririyin
     roles:
-      admin: Anedbal
       bot: Aṛubut
       group: Agraw
-      moderator: Atrar
     unavailable: Ur nufi ara amaɣnu-a
     unfollow: Ur ṭṭafaṛ ara
   admin:
@@ -81,7 +79,6 @@ kab:
       avatar: Tugna n umaɣnu
       by_domain: Taɣult
       change_email:
-        changed_msg: Imayl n umiḍan yettwabeddel mebla ugur!
         current_email: Imayl n tura
         label: Beddel imayl
         new_email: Imayl amaynut
@@ -152,12 +149,6 @@ kab:
       reset: Wennez
       reset_password: Beddel awal uffir
       resubscribe: Ales ajerred
-      role: Tisirag
-      roles:
-        admin: Anedbal
-        moderator: Aseɣyad
-        staff: Tarbaɛt
-        user: Amseqdac
       search: Nadi
       search_same_email_domain: Iseqdacen-nniḍen s yiwet n taɣult n yimayl
       search_same_ip: Imseqdacen-nniḍen s tansa IP am tinn-ik
@@ -446,9 +437,6 @@ kab:
         users: Γef yimseqdacen idiganen i yeqqnen
       profile_directory:
         title: Rmed akaram n imaγnuten
-      registrations:
-        min_invite_role:
-          disabled: Ula yiwen·t
       registrations_mode:
         modes:
           none: Yiwen·t ur yzmir ad izeddi