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

Conflicts:
- `.env.production.sample`:
  Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
  Minor conflict due to an optimization that wasn't shared between
  the two versions. Copied upstream's version.

5 files changed, 1 insertions, 11 deletions

diff --git a/config/locales-glitch/en.yml b/config/locales-glitch/en.yml
index 6268727a7..5cc2625fc 100644
--- a/config/locales-glitch/en.yml
+++ b/config/locales-glitch/en.yml
@@ -1,8 +1,6 @@
 ---
 en:
   admin:
-    dashboard:
-      keybase: Keybase integration
     settings:
       enable_keybase:
         desc_html: Allow your users to prove their identity via keybase
diff --git a/config/locales-glitch/es.yml b/config/locales-glitch/es.yml
index 7e8de1560..ad942a0c0 100644
--- a/config/locales-glitch/es.yml
+++ b/config/locales-glitch/es.yml
@@ -1,8 +1,6 @@
 ---
 es:
   admin:
-    dashboard:
-      keybase: Integración con keybase
     settings:
       enable_keybase:
         desc_html: Permite a tus usuarixs comprobar su identidad por medio de keybase
@@ -22,4 +20,4 @@ es:
   generic:
     use_this: Usar
   settings:
-    flavours: Ediciones
\ No newline at end of file
+    flavours: Ediciones
diff --git a/config/locales-glitch/ja.yml b/config/locales-glitch/ja.yml
index 2be4e9ea0..3ecb46ccd 100644
--- a/config/locales-glitch/ja.yml
+++ b/config/locales-glitch/ja.yml
@@ -1,8 +1,6 @@
 ---
 ja:
   admin:
-    dashboard:
-      keybase: Keybase統合
     settings:
       enable_keybase:
         desc_html: Keybaseにより身元の証明が可能となります
diff --git a/config/locales-glitch/ko.yml b/config/locales-glitch/ko.yml
index ae7f091bb..aef10f677 100644
--- a/config/locales-glitch/ko.yml
+++ b/config/locales-glitch/ko.yml
@@ -1,8 +1,6 @@
 ---
 ko:
   admin:
-    dashboard:
-      keybase: 키베이스 연동
     settings:
       enable_keybase:
         desc_html: 사용자들이 키베이스를 통해 개인 신원을 증명할 수 있도록 허용
diff --git a/config/locales-glitch/zh-CN.yml b/config/locales-glitch/zh-CN.yml
index ea1db3eb9..37a8307e8 100644
--- a/config/locales-glitch/zh-CN.yml
+++ b/config/locales-glitch/zh-CN.yml
@@ -1,8 +1,6 @@
 ---
 zh-CN:
   admin:
-    dashboard:
-      keybase: Keybase 集成
     settings:
       enable_keybase:
         desc_html: 允许你的用户使用 Keybase 证明身份