diff options
author | ThibG <thib@sitedethib.com> | 2018-10-28 20:36:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-28 20:36:55 +0100 |
commit | 7f22ed0fc912ffbd94e0df4e0d40750dae542b97 (patch) | |
tree | 770029d865518400da31e9cdb55fc9c584e5a90b /config/locales/simple_form.en.yml | |
parent | ee1f1a2ec97604ed364a5944bd300be0771ba7d7 (diff) | |
parent | b00f60f1d3d5415b5fd536191a7ee183ae910d03 (diff) |
Merge pull request #794 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 | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index b25ff26f4..e37952923 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -8,9 +8,6 @@ en: bot: This account mainly performs automated actions and might not be monitored context: One or multiple contexts where the filter should apply digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence - display_name: - one: <span class="name-counter">1</span> character left - other: <span class="name-counter">%{count}</span> characters left email: You will be sent a confirmation e-mail fields: You can have up to 4 items displayed as a table on your profile header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px @@ -18,9 +15,6 @@ en: 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 - note: - one: <span class="note-counter">1</span> character left - other: <span class="note-counter">%{count}</span> characters left password: Use at least 8 characters phrase: Will be matched regardless of casing in text or content warning of a toot scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones. |