diff options
| author | ThibG <thib@sitedethib.com> | 2020-02-06 22:48:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-06 22:48:26 +0100 |
| commit | 96ec90b986c8a2783135f123c10062725d274733 (patch) | |
| tree | 1cbb8b756a2e4d0770c19b834ede0326f99a3dcc /config/locales/en.yml | |
| parent | ccaefd139d33f2f0bf4d097131bcf91960bee956 (diff) | |
| parent | fe9a124f5a9f3a7cb6cfba141245cccb88c7dfbe (diff) | |
Merge pull request #1278 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, 1 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index dcfe5f1cc..8e819b5b1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -39,7 +39,7 @@ en: unavailable_content_description: domain: Server reason: Reason - rejecting_media: 'Media files from these servers will not be processed or stored, and and no thumbnails will be displayed, requiring manual click-through to the original file:' + rejecting_media: 'Media files from these servers will not be processed or stored, and no thumbnails will be displayed, requiring manual click-through to the original file:' silenced: 'Posts from these servers will be hidden in public timelines and conversations, and no notifications will be generated from their users'' interactions, unless you are following them:' suspended: 'No data from these servers will be processed, stored or exchanged, making any interaction or communication with users from these servers impossible:' unavailable_content_html: Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server. |