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:
	config/locales/simple_form.ja.yml
This commit is contained in:
Thibaut Girka
2018-05-19 22:41:10 +02:00
parent 625c4f36ef 6aa5ea1b5d
commit b481e4fac1
113 changed files with 595 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,10 @@
{
"defaultMessage": "{name} mentioned you",
"id": "notification.mention"
},
{
"defaultMessage": "{count} notifications",
"id": "notifications.group"
}
],
"path": "app/javascript/mastodon/actions/notifications.json"
@@ -870,8 +874,12 @@
"id": "compose_form.hashtag_warning"
},
{
"defaultMessage": "This toot will only be visible to all the mentioned users.",
"defaultMessage": "This toot will only be sent to all the mentioned users.",
"id": "compose_form.direct_message_warning"
},
{
"defaultMessage": "Learn more",
"id": "compose_form.direct_message_warning_learn_more"
}
],
"path": "app/javascript/mastodon/features/compose/containers/warning_container.json"