tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Claire
2022-08-01 17:47:02 +02:00
parent ed039075c4 4b36e47474
commit 3a9e3c1248
112 changed files with 825 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/mastodon/locales/ja.json
View File

@ -224,6 +224,9 @@
"hashtag.column_settings.tag_mode.any": "いずれかを含む",
"hashtag.column_settings.tag_mode.none": "これらを除く",
"hashtag.column_settings.tag_toggle": "このカラムに追加のタグを含める",
"hashtag.follow": "Follow hashtag",
"hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
"hashtag.unfollow": "Unfollow hashtag",
"home.column_settings.basic": "基本設定",
"home.column_settings.show_reblogs": "ブースト表示",
"home.column_settings.show_replies": "返信表示",
@ -522,7 +525,7 @@
"timeline_hint.resources.followers": "フォロワー",
"timeline_hint.resources.follows": "フォロー",
"timeline_hint.resources.statuses": "以前の投稿",
"trends.counter_by_accounts": "{counter}人が投稿",
"trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
"trends.trending_now": "トレンドタグ",
"ui.beforeunload": "Mastodonから離れると送信前の投稿は失われます。",
"units.short.billion": "{count}B",