diff options
author | ThibG <thib@sitedethib.com> | 2020-11-04 14:52:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-04 14:52:19 +0100 |
commit | 1f69ad798d9a42d8ec3df69ded7625524c5eb67c (patch) | |
tree | a8e0759e3f13bf13dabbb8a261cd1bdb2f3e1e1a /app/javascript/mastodon/locales/defaultMessages.json | |
parent | b8e790c3c22693271a4fd74ce34067c462ebf8a3 (diff) | |
parent | dc86d814d93b9bb564ab35728c6d9fb65d064ca3 (diff) |
Merge pull request #1450 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/mastodon/locales/defaultMessages.json')
-rw-r--r-- | app/javascript/mastodon/locales/defaultMessages.json | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index db1158e50..bf7576975 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -1339,15 +1339,15 @@ { "descriptors": [ { - "defaultMessage": "Media is marked as sensitive", + "defaultMessage": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}", "id": "compose_form.sensitive.marked" }, { - "defaultMessage": "Media is not marked as sensitive", + "defaultMessage": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}", "id": "compose_form.sensitive.unmarked" }, { - "defaultMessage": "Mark media as sensitive", + "defaultMessage": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}", "id": "compose_form.sensitive.hide" } ], @@ -3217,6 +3217,19 @@ { "descriptors": [ { + "defaultMessage": "Compress image view box", + "id": "lightbox.compress" + }, + { + "defaultMessage": "Expand image view box", + "id": "lightbox.expand" + } + ], + "path": "app/javascript/mastodon/features/ui/components/zoomable_image.json" + }, + { + "descriptors": [ + { "defaultMessage": "Your draft will be lost if you leave Mastodon.", "id": "ui.beforeunload" } |