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-03-02 18:02:48 +01:00
parent 0b8fe020b5 462a6f7d72
commit 425a6c90c4
189 changed files with 2586 additions and 1444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,7 +341,7 @@
"notifications.column_settings.status": "新しい投稿:",
"notifications.column_settings.unread_notifications.category": "未読の通知:",
"notifications.column_settings.unread_notifications.highlight": "未読の通知を強調表示",
"notifications.column_settings.update": "Edits:",
"notifications.column_settings.update": "編集:",
"notifications.filter.all": "すべて",
"notifications.filter.boosts": "ブースト",
"notifications.filter.favourites": "お気に入り",