diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-12-16 17:49:11 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-12-16 17:49:11 +0000 |
| commit | a2f1ad93f557940635829aeb97cafa45dc6ed11e (patch) | |
| tree | b3623cd0f3cbe1f79baa238d0b7d64028f0f2fd9 /src/i18n | |
| parent | e8cebb568b70da50efccd7e018dc939b28bff76d (diff) | |
| parent | 10399c193a68fc14c0c72b0cf970bfe2605a247e (diff) | |
Merge branch 'develop' into 'fix/timeline-bar-clickables-offset'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'src/i18n')
| -rw-r--r-- | src/i18n/en.json | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/i18n/en.json b/src/i18n/en.json index c42126fc..f3450217 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -662,6 +662,7 @@ "unmute_conversation": "Unmute conversation", "status_unavailable": "Status unavailable", "copy_link": "Copy link to status", + "external_source": "External source", "thread_muted": "Thread muted", "thread_muted_and_words": ", has words:", "show_full_subject": "Show full subject", @@ -669,7 +670,8 @@ "show_content": "Show content", "hide_content": "Hide content", "status_deleted": "This post was deleted", - "nsfw": "NSFW" + "nsfw": "NSFW", + "expand": "Expand" }, "user_card": { "approve": "Approve", @@ -759,6 +761,7 @@ "upload": { "error": { "base": "Upload failed.", + "message": "Upload failed: {0}", "file_too_big": "File too big [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]", "default": "Try again later" }, |