about summary refs log tree commit diff
path: root/app/javascript/mastodon/locales/en.json
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-12-21 15:59:39 +0100
committerClaire <claire.github-309c@sitedethib.com>2022-12-21 15:59:39 +0100
commitb248aa4d3eb52c2bb7459848ff09619bb8830ed7 (patch)
treeb40d2a4546fa42a0373127bf11cb06491a1d75f3 /app/javascript/mastodon/locales/en.json
parentba1569400322930ebe32693750b8e1abff395829 (diff)
parentc4a429ed47e85a6bbf0d470a41cc2f64cf120c19 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/mastodon/locales/en.json')
-rw-r--r--app/javascript/mastodon/locales/en.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index cb190b496..8958b1ec0 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -54,6 +54,7 @@
   "account.posts_with_replies": "Posts and replies",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval. Click to cancel follow request",
+  "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show boosts from @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Post} other {{counter} Posts}}",
@@ -466,7 +467,6 @@
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
-  "relative_format.today": "Today at {time}",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
   "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",