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

This commit is contained in:
Claire
2021-05-09 10:41:28 +02:00
187 changed files with 5853 additions and 2364 deletions

View File

@@ -242,7 +242,7 @@
{
"descriptors": [
{
"defaultMessage": "Hide {number, plural, one {image} other {images}}",
"defaultMessage": "{number, plural, one {Hide image} other {Hide images}}",
"id": "media_gallery.toggle_visible"
},
{
@@ -1651,6 +1651,10 @@
"defaultMessage": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
"id": "follow_recommendations.lead"
},
{
"defaultMessage": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
"id": "empty_column.follow_recommendations"
},
{
"defaultMessage": "Done",
"id": "follow_recommendations.done"