diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-12-19 12:58:49 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-12-19 12:58:49 +0100 |
commit | add74816a5fd7c46391413a61f06e01f173ea295 (patch) | |
tree | a1f23bd6e496495ea69c1b831359f7770b7e9354 /config/locales/en.yml | |
parent | 655da1be2029cecedcaf86479938d7805e72107d (diff) | |
parent | af56efdec56230eddab711edd33a7e33694f2b34 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r-- | config/locales/en.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index d6f071c78..735a88efd 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -104,6 +104,7 @@ en: followers: Followers followers_url: Followers URL follows: Follows + header: Header inbox_url: Inbox URL ip: IP location: @@ -134,6 +135,7 @@ en: push_subscription_expires: PuSH subscription expires redownload: Refresh avatar remove_avatar: Remove avatar + remove_header: Remove header resend_confirmation: already_confirmed: This user is already confirmed send: Resend confirmation email |