commit: f0ae6b4cc5f0cb63e0ac7ed183e02f9bbbe70a0e parent 9e3a6d678424728508bf58cee6172731d27a27a1 Author: Eugen Rochko <eugen@zeonfederated.com> Date: Tue, 13 Mar 2018 09:18:11 +0100 Merge branch 'spoiler' of git://github.com/kagucho/mastodon into kagucho-spoilerDiffstat:
39 files changed, 92 insertions(+), 41 deletions(-)diff --git a/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js b/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js@@ -4,12 +4,13 @@ import { changeComposeSpoilerness } from '../../../actions/compose'; import { injectIntl, defineMessages } from 'react-intl'; const messages = defineMessages({ - title: { id: 'compose_form.spoiler', defaultMessage: 'Hide text behind warning' }, + marked: { id: 'compose_form.spoiler.marked', defaultMessage: 'Text is hidden behind warning' }, + unmarked: { id: 'compose_form.spoiler.unmarked', defaultMessage: 'Text is not hidden' }, }); const mapStateToProps = (state, { intl }) => ({ label: 'CW', - title: intl.formatMessage(messages.title), + title: intl.formatMessage(state.getIn(['compose', 'spoiler']) ? messages.marked : messages.unmarked), active: state.getIn(['compose', 'spoiler']), ariaControls: 'cw-spoiler-input', });diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "أخفِ النص واعرض تحذيرا", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "تنبيه عن المحتوى", "confirmation_modal.cancel": "إلغاء", "confirmations.block.confirm": "حجب",diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Скрий текста зад предупреждение", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Content warning", "confirmation_modal.cancel": "Cancel", "confirmations.block.confirm": "Block",diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Amaga el text darrera darrere un avís", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Escriu l'avís aquí", "confirmation_modal.cancel": "Cancel·la", "confirmations.block.confirm": "Bloca",diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Text hinter Warnung verbergen", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Inhaltswarnung", "confirmation_modal.cancel": "Abbrechen", "confirmations.block.confirm": "Blockieren",diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json@@ -322,6 +322,15 @@ { "descriptors": [ { + "defaultMessage": "Media", + "id": "account.media" + } + ], + "path": "app/javascript/mastodon/features/account_gallery/index.json" + }, + { + "descriptors": [ + { "defaultMessage": "Toots", "id": "account.posts" }, @@ -781,8 +790,12 @@ { "descriptors": [ { - "defaultMessage": "Hide text behind warning", - "id": "compose_form.spoiler" + "defaultMessage": "Text is hidden behind warning", + "id": "compose_form.spoiler.marked" + }, + { + "defaultMessage": "Text is not hidden", + "id": "compose_form.spoiler.unmarked" } ], "path": "app/javascript/mastodon/features/compose/containers/spoiler_button_container.json"diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Hide text behind warning", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Write your warning here", "confirmation_modal.cancel": "Cancel", "confirmations.block.confirm": "Block",diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Kaŝi tekston malantaŭ averto", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Skribu vian averton ĉi tie", "confirmation_modal.cancel": "Nuligi", "confirmations.block.confirm": "Bloki",diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Ocultar texto tras una advertencia", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Advertencia de contenido", "confirmation_modal.cancel": "Cancelar", "confirmations.block.confirm": "Bloquear",diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "نوشته را پشت هشدار پنهان کنید", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "هشدار محتوا", "confirmation_modal.cancel": "بیخیال", "confirmations.block.confirm": "مسدود کن",diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Piiloita teksti varoituksen taakse", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Content warning", "confirmation_modal.cancel": "Peruuta", "confirmations.block.confirm": "Estä",diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish} !", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Masquer le texte derrière un avertissement", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Écrivez ici votre avertissement", "confirmation_modal.cancel": "Annuler", "confirmations.block.confirm": "Bloquer",diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Agochar texto detrás de un aviso", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Escriba o aviso aquí", "confirmation_modal.cancel": "Cancelar", "confirmations.block.confirm": "Bloquear",diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "לחצרץ!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "הסתרה מאחורי אזהרת תוכן", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "אזהרת תוכן", "confirmation_modal.cancel": "ביטול", "confirmations.block.confirm": "לחסום",diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Sakrij text iza upozorenja", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Upozorenje o sadržaju", "confirmation_modal.cancel": "Otkaži", "confirmations.block.confirm": "Blokiraj",diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Szöveg figyelmeztetés mögé rejtése", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Figyelmeztetését írja ide", "confirmation_modal.cancel": "Bezár", "confirmations.block.confirm": "Letilt",diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "Թթե՜լ", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Թաքցնել տեքստը նախազգուշացման ետեւում", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Գրիր նախազգուշացումդ այստեղ", "confirmation_modal.cancel": "Չեղարկել", "confirmations.block.confirm": "Արգելափակել",diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Sembunyikan teks dibalik peringatan", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Peringatan konten", "confirmation_modal.cancel": "Batal", "confirmations.block.confirm": "Blokir",diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Celar texto dop averto", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Averto di kontenajo", "confirmation_modal.cancel": "Cancel", "confirmations.block.confirm": "Block",diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Nascondi testo con avvertimento", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Content warning", "confirmation_modal.cancel": "Cancel", "confirmations.block.confirm": "Block",diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}！", "compose_form.sensitive.marked": "メディアに閲覧注意が設定されています", "compose_form.sensitive.unmarked": "メディアに閲覧注意が設定されていません", - "compose_form.spoiler": "テキストを隠す", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "ここに警告を書いてください", "confirmation_modal.cancel": "キャンセル", "confirmations.block.confirm": "ブロック",diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "텍스트 숨기기", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "경고", "confirmation_modal.cancel": "취소", "confirmations.block.confirm": "차단",diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Tekst achter waarschuwing verbergen", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Waarschuwingstekst", "confirmation_modal.cancel": "Annuleren", "confirmations.block.confirm": "Blokkeren",diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Skjul tekst bak advarsel", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Innholdsadvarsel", "confirmation_modal.cancel": "Avbryt", "confirmations.block.confirm": "Blokkèr",diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish} !", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Rescondre lo tèxte darrièr un avertiment", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Escrivètz l’avertiment aquí", "confirmation_modal.cancel": "Anullar", "confirmations.block.confirm": "Blocar",diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Ukryj tekst za ostrzeżeniem", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Wprowadź swoje ostrzeżenie o zawartości", "confirmation_modal.cancel": "Anuluj", "confirmations.block.confirm": "Zablokuj",diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Esconder texto com aviso de conteúdo", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Aviso de conteúdo", "confirmation_modal.cancel": "Cancelar", "confirmations.block.confirm": "Bloquear",diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Esconder texto com aviso", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Aviso de conteúdo", "confirmation_modal.cancel": "Cancelar", "confirmations.block.confirm": "Block",diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Скрыть текст за предупреждением", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Напишите свое предупреждение здесь", "confirmation_modal.cancel": "Отмена", "confirmations.block.confirm": "Заблокировать",diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Skryť text za varovanie", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Sem napíšte vaše varovanie", "confirmation_modal.cancel": "Zrušiť", "confirmations.block.confirm": "Blokovať",diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Sakrij tekst ispod upozorenja", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Ovde upišite upozorenje", "confirmation_modal.cancel": "Poništi", "confirmations.block.confirm": "Blokiraj",diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Сакриј текст испод упозорења", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Овде упишите упозорење", "confirmation_modal.cancel": "Поништи", "confirmations.block.confirm": "Блокирај",diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Dölj text bakom varning", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Skriv din varning här", "confirmation_modal.cancel": "Ångra", "confirmations.block.confirm": "Blockera",diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Hide text behind warning", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Content warning", "confirmation_modal.cancel": "Cancel", "confirmations.block.confirm": "Block",diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Metni uyarı arkasına gizle", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "İçerik uyarısı", "confirmation_modal.cancel": "İptal", "confirmations.block.confirm": "Engelle",diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}!", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "Приховати текст за попередженням", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Попередження щодо прихованого тексту", "confirmation_modal.cancel": "Відмінити", "confirmations.block.confirm": "Заблокувати",diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}！", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "折叠嘟文内容", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "折叠部分的警告消息", "confirmation_modal.cancel": "取消", "confirmations.block.confirm": "屏蔽",diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}！", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "將部份文字藏於警告訊息之後", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "敏感警告訊息", "confirmation_modal.cancel": "取消", "confirmations.block.confirm": "封鎖",diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json@@ -62,7 +62,8 @@ "compose_form.publish_loud": "{publish}！", "compose_form.sensitive.marked": "Media is marked as sensitive", "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler": "將訊息隱藏在警告訊息之後", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "內容警告", "confirmation_modal.cancel": "取消", "confirmations.block.confirm": "封鎖",