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

2022-04-25 17:09:32 +02:00
parent bb12af7250 f47a9ddc9f
commit 002d2729fb
61 changed files with 538 additions and 320 deletions
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -520,7 +520,7 @@
  "upload_error.poll": "アンケートではファイルをアップロードできません。",
  "upload_form.audio_description": "聴取が難しいユーザーへの説明",
  "upload_form.description": "閲覧が難しいユーザーへの説明",
-  "upload_form.description_missing": "No description added",
+  "upload_form.description_missing": "説明を追加していません",
  "upload_form.edit": "編集",
  "upload_form.thumbnail": "サムネイルを変更",
  "upload_form.undo": "削除",