Merge tag 'v2.7.0' into instance_only_statuses

This commit is contained in:
Renato "Lond" Cerqueira
2019-01-22 11:56:24 +01:00
115 changed files with 2913 additions and 803 deletions
+3
View File
@@ -553,8 +553,11 @@ en:
warning_title: Disseminated content availability
directories:
directory: Profile directory
enabled: You are currently listed in the directory.
enabled_but_waiting: You have opted-in to be listed in the directory, but you do not have the minimum number of followers (%{min_followers}) to be listed yet.
explanation: Discover users based on their interests
explore_mastodon: Explore %{title}
how_to_enable: You are not currently opted-in to the directory. You can opt-in below. Use hashtags in your bio text to be listed under specific hashtags!
people:
one: "%{count} person"
other: "%{count} people"