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

Merge remote-tracking branch 'origin/master' into merge-upstream

Browse Source 
Conflicts:
	.travis.yml
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_detailed_status.html.haml
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
This commit is contained in:
David Yip
2018-02-09 09:25:53 -06:00
parent 5ba2c300d8 235c14c79d
commit 020b40efdb
16 changed files with 55 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -433,7 +433,7 @@
"id": "account.view_full_profile"
},
{
"defaultMessage": "Posts",
"defaultMessage": "Toots",
"id": "account.posts"
},
{

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

@ -13,7 +13,7 @@
"account.moved_to": "{name} has moved to:",
"account.mute": "Mute @{name}",
"account.mute_notifications": "Mute notifications from @{name}",
"account.posts": "Posts",
"account.posts": "Toots",
"account.report": "Report @{name}",
"account.requested": "Awaiting approval. Click to cancel follow request",
"account.share": "Share @{name}'s profile",