From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 13 Mar 2018 08:18:11 +0000 (+0100)
Subject: Merge branch 'spoiler' of git://github.com/kagucho/mastodon into kagucho-spoiler
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f0ae6b4cc5f0cb63e0ac7ed183e02f9bbbe70a0e;p=mastodon.git

Merge branch 'spoiler' of git://github.com/kagucho/mastodon into kagucho-spoiler
---

f0ae6b4cc5f0cb63e0ac7ed183e02f9bbbe70a0e
diff --cc app/javascript/mastodon/locales/ar.json
index 9898adc13,c7734d72e..4928930fe
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "فيمَ تفكّر؟",
    "compose_form.publish": "بوّق",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "ضع علامة على الوسيط باعتباره حسّاس",
 +  "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 --cc app/javascript/mastodon/locales/bg.json
index 0c0ead0f8,b596d25a0..1dee16748
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Какво си мислиш?",
    "compose_form.publish": "Раздумай",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Отбележи съдържанието като деликатно",
 +  "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 --cc app/javascript/mastodon/locales/ca.json
index d080227bd,729d29876..4923c1032
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "En què estàs pensant?",
    "compose_form.publish": "Toot",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Marca el contingut multimèdia com a sensible",
 +  "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 --cc app/javascript/mastodon/locales/de.json
index f20d13bc1,15ede8262..e0fc0ee85
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Worüber möchtest du schreiben?",
    "compose_form.publish": "Tröt",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Medien als heikel markieren",
 +  "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 --cc app/javascript/mastodon/locales/defaultMessages.json
index 1b8111307,4466d2ff6..5bb7b85d6
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@@ -319,6 -319,6 +319,15 @@@
      ],
      "path": "app/javascript/mastodon/containers/status_container.json"
    },
++  {
++    "descriptors": [
++      {
++        "defaultMessage": "Media",
++        "id": "account.media"
++      }
++    ],
++    "path": "app/javascript/mastodon/features/account_gallery/index.json"
++  },
    {
      "descriptors": [
        {
diff --cc app/javascript/mastodon/locales/en.json
index cabfff04a,d32e94129..d0d863f79
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "What is on your mind?",
    "compose_form.publish": "Toot",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Mark media as sensitive",
 +  "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 --cc app/javascript/mastodon/locales/eo.json
index e8cea8da5,6dd9ed133..fd687e8b1
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Pri kio vi pensas?",
    "compose_form.publish": "Hup",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Marki aŭdovidaĵon tikla",
 +  "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 --cc app/javascript/mastodon/locales/es.json
index f857f38a7,9a219f951..92b37dbf0
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "¿En qué estás pensando?",
    "compose_form.publish": "Tootear",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Marcar contenido como sensible",
 +  "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 --cc app/javascript/mastodon/locales/fa.json
index 85f5c1e44,9a925c320..455dc5d9f
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "تازه چه خبر؟",
    "compose_form.publish": "بوق",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "تصاویر حساس هستند",
 +  "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 --cc app/javascript/mastodon/locales/fi.json
index 3838bcafd,c8775c78d..1dea42ed4
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Mitä sinulla on mielessä?",
    "compose_form.publish": "Toot",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Merkitse media herkäksi",
 +  "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 --cc app/javascript/mastodon/locales/fr.json
index aaa70c1b3,202d0f7ce..2613fe56d
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Qu’avez-vous en tête ?",
    "compose_form.publish": "Pouet",
    "compose_form.publish_loud": "{publish} !",
 -  "compose_form.sensitive": "Marquer le média comme sensible",
 +  "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 --cc app/javascript/mastodon/locales/gl.json
index 553501cb7,404253b7f..edfb9cfcb
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "A qué andas?",
    "compose_form.publish": "Toot",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Marcar medios como sensibles",
 +  "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 --cc app/javascript/mastodon/locales/he.json
index 7ad7fcb0a,c9dcd088d..b637ae414
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "מה עובר לך בראש?",
    "compose_form.publish": "ללחוש",
    "compose_form.publish_loud": "לחצרץ!",
 -  "compose_form.sensitive": "סימון תוכן כרגיש",
 +  "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 --cc app/javascript/mastodon/locales/hr.json
index a609a9d4a,6c8283870..4b64d796d
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Å to ti je na umu?",
    "compose_form.publish": "Toot",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Označi media sadržaj kao osjetljiv",
 +  "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 --cc app/javascript/mastodon/locales/hu.json
index 253f3fba0,1d635490c..79888e41e
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Mire gondolsz?",
    "compose_form.publish": "Tülk",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Tartalom érzékenynek jelölése",
 +  "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 --cc app/javascript/mastodon/locales/hy.json
index bc3ea72e5,6e1002487..932ff1565
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Ի՞նչ կա մտքիդ",
    "compose_form.publish": "Ô¹Õ©Õ¥Õ¬",
    "compose_form.publish_loud": "Թթե՜լ",
 -  "compose_form.sensitive": "Նշել բովանդակությունը որպես կասկածելի",
 +  "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 --cc app/javascript/mastodon/locales/id.json
index d5223eae6,923dee919..14261f199
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Apa yang ada di pikiran anda?",
    "compose_form.publish": "Toot",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Tandai media sensitif",
 +  "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 --cc app/javascript/mastodon/locales/io.json
index 4728550f0,f174a0c7d..5ea982f46
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Quo esas en tua spirito?",
    "compose_form.publish": "Siflar",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Markizar kontenajo kom trubliva",
 +  "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 --cc app/javascript/mastodon/locales/it.json
index 1ee98fbdc,72e8381f1..068598de2
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "A cosa stai pensando?",
    "compose_form.publish": "Toot",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Segnala file come sensibile",
 +  "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 --cc app/javascript/mastodon/locales/ja.json
index c3184191e,1001c196e..514a5bf42
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "今なにしてる？",
    "compose_form.publish": "トゥート",
    "compose_form.publish_loud": "{publish}！",
 -  "compose_form.sensitive": "メディアを閲覧注意としてマークする",
 +  "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 --cc app/javascript/mastodon/locales/ko.json
index 6dd8e6cb2,039f3a403..532c1f04d
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "지금 무엇을 하고 있나요?",
    "compose_form.publish": "툿",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "이 미디어를 민감한 미디어로 취급",
 +  "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 --cc app/javascript/mastodon/locales/nl.json
index d494134f2,f58d0314b..d508d9412
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Wat wil je kwijt?",
    "compose_form.publish": "Toot",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Media als gevoelig markeren (nsfw)",
 +  "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 --cc app/javascript/mastodon/locales/no.json
index e2095035f,b82476b0c..aaad033e2
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Hva har du på hjertet?",
    "compose_form.publish": "Tut",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Merk media som følsomt",
 +  "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 --cc app/javascript/mastodon/locales/oc.json
index 706c4f6d8,d6308b864..c7a26c1c6
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "A de qué pensatz ?",
    "compose_form.publish": "Tut",
    "compose_form.publish_loud": "{publish} !",
 -  "compose_form.sensitive": "Marcar lo mèdia coma sensible",
 +  "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 --cc app/javascript/mastodon/locales/pl.json
index 4f3d6c1bb,b7523f6d8..2d6f0c01b
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Co Ci chodzi po głowie?",
    "compose_form.publish": "Wyślij",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Oznacz treści jako wrażliwe",
 +  "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 --cc app/javascript/mastodon/locales/pt-BR.json
index eb9865756,6416f2598..6bf24c52a
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "No que você está pensando?",
    "compose_form.publish": "Publicar",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Marcar mídia como conteúdo sensível",
 +  "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 --cc app/javascript/mastodon/locales/pt.json
index b5f2610fe,5f87fabd7..3b20cf4e6
--- a/app/javascript/mastodon/locales/pt.json
+++ b/app/javascript/mastodon/locales/pt.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Em que estás a pensar?",
    "compose_form.publish": "Publicar",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Marcar media como conteúdo sensível",
 +  "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 --cc app/javascript/mastodon/locales/ru.json
index e07f5dc6f,690b8e28a..ec21b5d55
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "О чем Вы думаете?",
    "compose_form.publish": "Трубить",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Отметить как чувствительный контент",
 +  "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 --cc app/javascript/mastodon/locales/sk.json
index eab1c0296,ead0e8e29..2cb249d2a
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Na čo myslíš?",
    "compose_form.publish": "Toot",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Označ médiá ako chúlostivé",
 +  "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 --cc app/javascript/mastodon/locales/sr-Latn.json
index f2011bd99,7f4e64c20..c6512cda4
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Å ta Vam je na umu?",
    "compose_form.publish": "Tutni",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Obeleži multimediju kao osetljivu",
 +  "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 --cc app/javascript/mastodon/locales/sr.json
index 60f839d48,52f756a70..93fbe5960
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Шта Вам је на уму?",
    "compose_form.publish": "Тутни",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Обележи мултимедију као осетљиву",
 +  "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 --cc app/javascript/mastodon/locales/sv.json
index 66ce46055,1436d23b8..3451212d0
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Vad funderar du på?",
    "compose_form.publish": "Toot",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Markera media som känslig",
 +  "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 --cc app/javascript/mastodon/locales/th.json
index 489ce436e,5fdbb848a..95a933b40
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "What is on your mind?",
    "compose_form.publish": "Toot",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Mark media as sensitive",
 +  "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 --cc app/javascript/mastodon/locales/tr.json
index db67d9880,f7903584a..baaa5c97a
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Ne düşünüyorsun?",
    "compose_form.publish": "Toot",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Görseli hassas olarak işaretle",
 +  "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 --cc app/javascript/mastodon/locales/uk.json
index 5a40abdd5,c2601797a..1755c55b4
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "Що у Вас на думці?",
    "compose_form.publish": "Дмухнути",
    "compose_form.publish_loud": "{publish}!",
 -  "compose_form.sensitive": "Відмітити як непристойний зміст",
 +  "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 --cc app/javascript/mastodon/locales/zh-CN.json
index 88a362bec,bfc4c682a..d031c85f3
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "在想啥？",
    "compose_form.publish": "嘟嘟",
    "compose_form.publish_loud": "{publish}！",
 -  "compose_form.sensitive": "将媒体文件标记为敏感内容",
 +  "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 --cc app/javascript/mastodon/locales/zh-HK.json
index 363f18dcb,403f40eef..d3ad238ad
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "你在想甚麼？",
    "compose_form.publish": "發文",
    "compose_form.publish_loud": "{publish}！",
 -  "compose_form.sensitive": "將媒體檔案標示為「敏感內容」",
 +  "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 --cc app/javascript/mastodon/locales/zh-TW.json
index a85903fdb,1a1b8f378..3a5eade41
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@@ -60,9 -60,9 +60,10 @@@
    "compose_form.placeholder": "在想些什麼？",
    "compose_form.publish": "貼掉",
    "compose_form.publish_loud": "{publish}！",
 -  "compose_form.sensitive": "將此媒體標為敏感",
 +  "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": "封鎖",