about summary refs log tree commit diff
path: root/config/locales/en.yml
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-08-28 19:51:36 +0200
committerGitHub <noreply@github.com>2018-08-28 19:51:36 +0200
commit14563f51674aa601b7684dc62a394469a9634c4d (patch)
tree3ed84be5da351d2819fcc6088c273e34c9c86846 /config/locales/en.yml
parent3fe5029fbec1e328d95b768f6bd40fec8af0906c (diff)
parent43d132039bf0fdd8c6bc6e2a1d2fe3ef59c0710f (diff)
Merge pull request #684 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r--config/locales/en.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b185ae28a..38a6df8f7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -303,6 +303,7 @@ en:
       description_html: A <strong>federation relay</strong> is an intermediary server that exchanges large volumes of public toots between servers that subscribe and publish to it. <strong>It can help small and medium servers discover content from the fediverse</strong>, which would otherwise require local users manually following other people on remote servers.
       enable_hint: Once enabled, your server will subscribe to all public toots from this relay, and will begin sending this server's public toots to it.
       inbox_url: Relay URL
+      pending: Waiting for relay's approval
       setup: Setup a relay connection
       status: Status
       title: Relays