diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-19 16:19:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-19 16:19:00 +0100 |
| commit | aae088aaf0d5de542d917d11b7b2e86047645dd7 (patch) | |
| tree | a4a58bba9c294d0c3ed0ea5c6c54e3bfa0507263 /config/locales/en.yml | |
| parent | 655da1be2029cecedcaf86479938d7805e72107d (diff) | |
| parent | 222865584842de9c2bd3f47737e9ccf6aa8eac93 (diff) | |
Merge pull request #865 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |