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

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

Browse Source 
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
This commit is contained in:
Thibaut Girka
2019-04-01 21:28:31 +02:00
parent 925830d11b 120544067f
commit 12dae9d583
33 changed files with 259 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/javascript/mastodon/locales/en.json
View File

@@ -121,6 +121,7 @@
"emoji_button.symbols": "Symbols",
"emoji_button.travel": "Travel & Places",
"empty_column.account_timeline": "No toots here!",
"empty_column.account_timeline_blocked": "You are blocked",
"empty_column.blocks": "You haven't blocked any users yet.",
"empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
"empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",