diff options
| author | kaniini <nenolod@gmail.com> | 2018-09-22 04:44:02 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-09-22 04:44:02 +0000 |
| commit | 1cbabf31ee7c6481ab18fd36fab76247b360e3be (patch) | |
| tree | 29964558a22fe0628eae3aebc342d983b24e0390 /src/i18n | |
| parent | cd48268c858f4a7f24767e41e81cb6524393c5e6 (diff) | |
| parent | 1af5c8fd39b559a4de23dc16a06f2760102a3e24 (diff) | |
Merge branch 'feature/rich-text-optout' into 'develop'
add support for disabling rich text formatting
See merge request pleroma/pleroma-fe!347
Diffstat (limited to 'src/i18n')
| -rw-r--r-- | src/i18n/en.json | 1 | ||||
| -rw-r--r-- | src/i18n/fr.json | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/i18n/en.json b/src/i18n/en.json index e18791e7..2dc6493e 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -130,6 +130,7 @@ "notification_visibility_likes": "Likes", "notification_visibility_mentions": "Mentions", "notification_visibility_repeats": "Repeats", + "no_rich_text_description": "Disable rich text support", "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding", "panelRadius": "Panels", "pause_on_unfocused": "Pause streaming when tab is not focused", diff --git a/src/i18n/fr.json b/src/i18n/fr.json index e8ddf767..022b68c1 100644 --- a/src/i18n/fr.json +++ b/src/i18n/fr.json @@ -89,6 +89,7 @@ "name": "Nom", "name_bio": "Nom & Bio", "new_password": "Nouveau mot de passe", + "no_rich_text_description": "Ne formatez pas le texte", "nsfw_clickthrough": "Masquer les images marquées comme contenu adulte ou sensible", "panelRadius": "Fenêtres", "presets": "Thèmes prédéfinis", |