Merge branch 'master' into glitch-soc/master

Conflicts:
- `config/locales/en.yml`
  No real conflict, upstream added a translatable string “too close” to
  one specific to glitch-soc
- `lib/mastodon/statuses_cli.rb`
  Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses
- `package.json`
  No real conflict, additional dependency in glitch-soc

1 files changed, 0 insertions, 8 deletions

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 64f479ec7..057b21566 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -118,9 +118,7 @@ gl:
       email_status: Estado do correo
       enable: Habilitar
       enabled: Habilitado
-      feed_url: URL fonte
       followers: Seguidoras
-      followers_url: URL das seguidoras
       follows: Segue
       header: Cabeceira
       inbox_url: URL da Caixa de entrada
@@ -148,10 +146,8 @@ gl:
       no_account_selected: Non cambiou nada xa que non tiña nada seleccionado
       no_limits_imposed: Sen límites impostos
       not_subscribed: Non suscrita
-      outbox_url: URL caixa de saída
       pending: Pendente revisión
       perform_full_suspension: Suspender
-      profile_url: URL do perfil
       promote: Promocionar
       protocol: Protocolo
       public: Público
@@ -174,7 +170,6 @@ gl:
         moderator: Moderador
         staff: Membresía
         user: Usuaria
-      salmon_url: URL Salmon
       search: Busca
       search_same_ip: Outros usuarios co mesmo IP
       shared_inbox_url: URL da caixa de entrada compartida
@@ -396,9 +391,6 @@ gl:
       created_msg: Creouse correctamente a nota do informe!
       destroyed_msg: Nota do informe eliminouse con éxito!
     reports:
-      account:
-        note: nota
-        report: informe
       action_taken_by: Acción tomada por
       are_you_sure: Está segura?
       assign_to_self: Asignarmo