From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 1 Mar 2022 08:59:18 +0000 (+0100)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c5925756f13398f42fb1a59f8504050d195888a8;p=mastodon.git

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

c5925756f13398f42fb1a59f8504050d195888a8
diff --cc app/javascript/mastodon/locales/ja.json
index 934857ed4,c1418459e..1a138d893
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@@ -303,8 -306,8 +310,9 @@@
    "navigation_bar.pins": "固定した投稿",
    "navigation_bar.preferences": "ユーザー設定",
    "navigation_bar.public_timeline": "連合タイムライン",
 +  "navigation_bar.misc": "その他",
    "navigation_bar.security": "セキュリティ",
+   "notification.admin.sign_up": "{name} signed up",
    "notification.favourite": "{name}さんがあなたの投稿をお気に入りに登録しました",
    "notification.follow": "{name}さんにフォローされました",
    "notification.follow_request": "{name} さんがあなたにフォローリクエストしました",