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:
	Gemfile

Solved conflicts by using upstream's line for posix-spawn
This commit is contained in:
Thibaut Girka
2018-05-16 21:52:38 +02:00
parent 80aad16e10 6bed372ad2
commit 78ac246b87
62 changed files with 672 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/locales/nl.yml
View File

@ -682,6 +682,7 @@ nl:
video:
one: "%{count} video"
other: "%{count} video's"
boosted_from_html: Geboost van %{acct_link}
content_warning: 'Tekstwaarschuwing: %{warning}'
disallowed_hashtags:
one: 'bevatte een niet toegestane hashtag: %{tags}'