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

diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 490654143..e6ee2bca9 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -79,10 +79,8 @@ sc:
     posts_tab_heading: Tuts
     posts_with_replies: Tuts e rispostas
     roles:
-      admin: Admin
       bot: Bot
       group: Grupu
-      moderator: Moderatzione
     unavailable: Su profilu no est a disponimentu
     unfollow: Non sigas prus
   admin:
@@ -101,7 +99,6 @@ sc:
       avatar: Immàgine de profilu
       by_domain: Domìniu
       change_email:
-        changed_msg: As cambiadu s'indiritzu eletrònicu.
         current_email: Indiritzu eletrònicu atuale
         label: Muda s'indiritzu eletrònicu
         new_email: Indiritzu eletrònicu nou
@@ -176,12 +173,6 @@ sc:
       reset: Reseta
       reset_password: Reseta sa crae
       resubscribe: Torra a sutascrìere
-      role: Permissos
-      roles:
-        admin: Amministratzione
-        moderator: Moderatzione
-        staff: Personale
-        user: Utente
       search: Chirca
       search_same_email_domain: Àteras persones cun su pròpiu domìniu de posta
       search_same_ip: Àteras persones cun sa pròpiu IP
@@ -548,9 +539,6 @@ sc:
         deletion:
           desc_html: Permite a chie si siat de cantzellare su contu suo
           title: Aberi s'eliminatzione de su contu
-        min_invite_role:
-          disabled: Nemos
-          title: Permite invitos de
         require_invite_text:
           desc_html: Cando is registratziones rechedent s'aprovatzione manuale, faghe chi a incarcare su butone "Pro ite ti boles iscrìere?" siat obligatòriu e no a praghere
           title: Rechede a is persones noas chi iscriant una resone prima de aderire
@@ -563,9 +551,6 @@ sc:
       show_known_fediverse_at_about_page:
         desc_html: Cando ativu, ammustrat in sa previsualizatzione is tuts de totu is istàntzias connòschidas. Si nono, ammustrat isceti is cuntenutos locales
         title: Include su cuntenutu federadu in sa pàgina no autenticada de sa lìnia de tempus pùblica
-      show_staff_badge:
-        desc_html: Ammustra un'insigna de personale in sa pàgina de utente
-        title: Ammustra insigna de personale
       site_description:
         desc_html: Paràgrafu de introdutzione a s'API. Descrie pro ite custu serbidore de Mastodon siat ispetziale e cale si siat àtera cosa de importu. Podes impreare etichetas HTML, mescamente <code>&lt;a&gt;</code> e <code>&lt;em&gt;</code>.
         title: Descritzione de su serbidore
@@ -816,7 +801,6 @@ sc:
       title: Modìfica filtru
     errors:
       invalid_context: Cuntestu mancante o non vàlidu
-      invalid_irreversible: Su filtràgiu non reversìbile funtzionat isceti in is cuntestos printzipale o de notìficas
     index:
       delete: Cantzella
       empty: Non tenes perunu filtru.