diff options
| author | ThibG <thib@sitedethib.com> | 2018-07-17 21:54:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 21:54:12 +0200 |
| commit | 012ca4c68d785dcf13e4cabd16b09a844e622f6b (patch) | |
| tree | 106543bbde5ca7a43920ae13928d9ead0075e88b /config/locales/simple_form.en.yml | |
| parent | 8e8491e1dab5e2ed98770710e0a32484de8530b3 (diff) | |
| parent | bcf157a1a9597595c61b1cce84bd62f63fcaa90b (diff) | |
Merge pull request #578 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/simple_form.en.yml')
| -rw-r--r-- | config/locales/simple_form.en.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index d74ccdfe2..cd99160e5 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -13,6 +13,7 @@ en: other: <span class="name-counter">%{count}</span> characters left fields: You can have up to 4 items displayed as a table on your profile header: PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px + inbox_url: Copy the URL from the frontpage of the relay you want to use irreversible: Filtered toots will disappear irreversibly, even if filter is later removed locale: The language of the user interface, e-mails and push notifications locked: Requires you to manually approve followers @@ -52,6 +53,7 @@ en: expires_in: Expire after fields: Profile metadata header: Header + inbox_url: URL of the relay inbox irreversible: Drop instead of hide locale: Interface language locked: Lock account |