diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-01-24 14:37:06 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-24 14:37:06 +0100 |
commit | 9adeaf2bfc1c16ca70e611b5288886b21414217b (patch) | |
tree | 53372bc9bd6f38d158aad50c768e18773b7d3f3b /app/javascript/mastodon/locales/ja.json | |
parent | a8c109baca4d02cc8aed454e231518c1f8ec1844 (diff) | |
parent | 4bae4e972d43f71bffb888ac82c180b2fa3f1ada (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system
Diffstat (limited to 'app/javascript/mastodon/locales/ja.json')
-rw-r--r-- | app/javascript/mastodon/locales/ja.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 76ad78012..51eeb1eb6 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -43,6 +43,7 @@ "alert.rate_limited.title": "制限に達しました", "alert.unexpected.message": "不明なエラーが発生しました。", "alert.unexpected.title": "エラー!", + "announcement.announcement": "告知", "autosuggest_hashtag.per_week": "{count} 回 / 週", "boost_modal.combo": "次からは{combo}を押せばスキップできます", "bundle_column_error.body": "コンポーネントの読み込み中に問題が発生しました。", |