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

2019-06-13 22:23:20 +02:00
parent 80849812d2 c9eeb2e832
commit 60adda7e59
255 changed files with 2788 additions and 3451 deletions
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -250,7 +250,7 @@
  "navigation_bar.personal": "個人用",
  "navigation_bar.pins": "固定したトゥート",
  "navigation_bar.preferences": "ユーザー設定",
-  "navigation_bar.profile_directory": "Profile directory",
+  "navigation_bar.profile_directory": "ディレクトリ",
  "navigation_bar.public_timeline": "連合タイムライン",
  "navigation_bar.misc": "その他",
  "navigation_bar.security": "セキュリティ",