diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-06-29 13:20:53 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-06-29 13:20:53 +0000 |
| commit | a290f53694a92c48909de82a73edae6c49b082da (patch) | |
| tree | 82deeaf8f8492efe959378ebda8ba7a8fdf50b23 /src/i18n | |
| parent | 61f34ff361a24a287ac0bf0c79fd2f77b4f2b708 (diff) | |
| parent | 82944f862d07db46cf342f2ee75b2ab6ddccc4fc (diff) | |
Merge branch 'develop' into 'feat/rich-text-preview'
# Conflicts:
# src/i18n/en.json
Diffstat (limited to 'src/i18n')
| -rw-r--r-- | src/i18n/en.json | 6 | ||||
| -rw-r--r-- | src/i18n/nl.json | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/i18n/en.json b/src/i18n/en.json index 21df3e73..ead4d0b0 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -638,7 +638,11 @@ "thread_muted": "Thread muted", "thread_muted_and_words": ", has words:", "preview": "Preview", - "preview_empty": "Empty" + "preview_empty": "Empty", + "show_full_subject": "Show full subject", + "hide_full_subject": "Hide full subject", + "show_content": "Show content", + "hide_content": "Hide content" }, "user_card": { "approve": "Approve", diff --git a/src/i18n/nl.json b/src/i18n/nl.json index 15ce5cbe..bf270f87 100644 --- a/src/i18n/nl.json +++ b/src/i18n/nl.json @@ -476,7 +476,14 @@ "backend_version": "Backend Versie", "title": "Versie" }, - "mutes_and_blocks": "Negeringen en Blokkades" + "mutes_and_blocks": "Negeringen en Blokkades", + "profile_fields": { + "value": "Inhoud", + "name": "Label", + "add_field": "Veld Toevoegen", + "label": "Profiel metadata" + }, + "bot": "Dit is een bot account" }, "timeline": { "collapse": "Inklappen", |