diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-08-01 20:24:23 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-08-01 20:24:23 +0200 |
commit | 2cfa14296186913a7fead419dd6324ba42e3a446 (patch) | |
tree | 2ab943a2bc96097b0b35f607334ae12d59c98ea4 /app/javascript/mastodon/locales/ja.json | |
parent | ab967cf5a0980934a68a4a4852ad25d10eec778e (diff) | |
parent | bfd5aea20686559f030ca0f2538bebc1943b398b (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `yarn.lock`: No real conflict, just a glitch-soc-only dependency textually too close to one updated upstream. Ported upstream changes.
Diffstat (limited to 'app/javascript/mastodon/locales/ja.json')
-rw-r--r-- | app/javascript/mastodon/locales/ja.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 46957c615..ef8d8d1e6 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -36,7 +36,7 @@ "account.requested": "フォロー承認待ちです。クリックしてキャンセル", "account.share": "@{name}さんのプロフィールを共有する", "account.show_reblogs": "@{name}さんからのブーストを表示", - "account.statuses_counter": "{counter} トゥート", + "account.statuses_counter": "{counter} 投稿", "account.unblock": "@{name}さんのブロックを解除", "account.unblock_domain": "{domain}のブロックを解除", "account.unendorse": "プロフィールから外す", |