diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-02-10 21:09:36 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-02-10 21:09:36 +0300 |
| commit | a52ae1ebeb0e69c4484122be8fca7e68b030db32 (patch) | |
| tree | 35ab07dcc52df64d2a5590614212a0e1cdf4bf65 /src/i18n | |
| parent | 64c180c8388afd229ffbcef745b6a81afa0d0056 (diff) | |
| parent | 17b6d8ddb8a9a1637fd88e017170b973b97381da (diff) | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
Diffstat (limited to 'src/i18n')
| -rw-r--r-- | src/i18n/en.json | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/i18n/en.json b/src/i18n/en.json index db2ce54d..74e71fc8 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -16,7 +16,16 @@ "mrf_policy_simple_media_removal": "Media Removal", "mrf_policy_simple_media_removal_desc": "This instance removes media from posts on the following instances:", "mrf_policy_simple_media_nsfw": "Media Force-set As Sensitive", - "mrf_policy_simple_media_nsfw_desc": "This instance forces media to be set sensitive in posts on the following instances:" + "mrf_policy_simple_media_nsfw_desc": "This instance forces media to be set sensitive in posts on the following instances:", + "mrf": { + "keyword": { + "keyword_policies": "Keyword Policies", + "ftl_removal": "Removal from \"The Whole Known Network\" Timeline", + "reject": "Reject", + "replace": "Replace", + "is_replaced_by": "→" + } + } }, "chat": { "title": "Chat" @@ -232,6 +241,7 @@ "desc": "To enable two-factor authentication, enter the code from your two-factor app:" } }, + "allow_following_move": "Allow auto-follow when following account moves", "attachmentRadius": "Attachments", "attachments": "Attachments", "autoload": "Enable automatic loading when scrolled to the bottom", |