Merge remote-tracking branch 'misskey/master' into feature/misskey-2024.07

2024-08-02 12:25:58 +01:00
parent ad9848acfa e98f66db51
commit cfa9b852df
585 changed files with 23423 additions and 9623 deletions
@@ -1124,8 +1124,6 @@ _sfx:
  note: "Poznámky"
  noteMy: "Vlastná poznámka"
  notification: "Oznámenia"
-  antenna: "Antény"
-  channel: "Upozornenia kanála"
 _ago:
  future: "Budúcnosť"
  justNow: "Teraz"
@@ -1447,6 +1445,10 @@ _deck:
 _webhookSettings:
  name: "Názov"
  active: "Zapnuté"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "Email"
 _moderationLogTypes:
  suspend: "Zmraziť"
  resetPassword: "Resetovať heslo"