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

diff --cc app/javascript/mastodon/locales/ar.json
index 9898adc1307867f95213cf16c246c1ccad954189,c7734d72e652b3a9c21005a98109a8aff76472d4..4928930fe5125cb5ae74451801fdcafd4815e55d
--- 1/app/javascript/mastodon/locales/ar.json
--- 2/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 0c0ead0f8575c7fe0e758d7cf5101d8a7bb5d0df,b596d25a0912a5107b962f218ad028208ddf4a86..1dee16748431562bc6d46d3b582e3606ede1ccfa
--- 1/app/javascript/mastodon/locales/bg.json
--- 2/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 d080227bd07b67ed354b06dd96f78367a212f804,729d29876f39906ca1aa59324b37b9d4dd125f2a..4923c1032626da13559cff7edd0cfff703865a8a
--- 1/app/javascript/mastodon/locales/ca.json
--- 2/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 f20d13bc1e0e86f94f6791a183a5c039a56945e9,15ede82626658a90b2060bcfdf919289717869fa..e0fc0ee850bc8c91115daf12ac2cced2d41a1010
--- 1/app/javascript/mastodon/locales/de.json
--- 2/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 1b8111307cef98da1f6a27fc06d9d231d5807ba5,4466d2ff638666bbfc0ebd01c6af4063e047ea70..5bb7b85d68daff00cba93714549b9fc3b99f9959
--- 1/app/javascript/mastodon/locales/defaultMessages.json
--- 2/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 cabfff04ad11b1716f5f600791532daa057746ff,d32e941295cf29ff7424c8f1e7ce09811a551b76..d0d863f797fef582ec46f34db287fbcf90d5e90f
--- 1/app/javascript/mastodon/locales/en.json
--- 2/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 e8cea8da5bea52066ec5f62198d03f1651418cb5,6dd9ed1339b9a0840bc6187ebc7ee43639cce267..fd687e8b1036ab649e9bd133403b8d99d3ac64ce
--- 1/app/javascript/mastodon/locales/eo.json
--- 2/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 f857f38a7cad1ddb2a7acb50a44817c7b92b0294,9a219f9515b0026a0a2ad29e65076a6500bfdb58..92b37dbf03658ec9a2b2f4f350bc5a89a21a903f
--- 1/app/javascript/mastodon/locales/es.json
--- 2/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 85f5c1e44a6b295ecc01939eb0fe24e8ef9eb4c0,9a925c320d912bd14f7a75780848ac4fb68b50c3..455dc5d9f5df0404b3226578c4591a37757d0f01
--- 1/app/javascript/mastodon/locales/fa.json
--- 2/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 3838bcafd84ed737e3a58027819a75add9b7dff1,c8775c78d5cada07d9dd6a7a58cb5fb2d8863d6d..1dea42ed44b51b95e88e27b90862cf2c20441ebc
--- 1/app/javascript/mastodon/locales/fi.json
--- 2/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 aaa70c1b3a11b47ca3d6cc5574c7d0211b870c2d,202d0f7ce6a5acc3cb8abc3eb36f2f46b6cfdbe4..2613fe56dd6ca537edafc083b48e1770831ae885
--- 1/app/javascript/mastodon/locales/fr.json
--- 2/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 553501cb7a9daf1fc4a61e86acbb5d2c9c3073cc,404253b7f819f72da35f340cba3e77d1b5bf17dd..edfb9cfcb9832294c18d755f135948a2e3c6117d
--- 1/app/javascript/mastodon/locales/gl.json
--- 2/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 7ad7fcb0a3f707c60fd1775188f9f83fc430cf4a,c9dcd088dc7f89e64bf5933f2986d730e43fafef..b637ae4147aa4a13100045f6a9442ec2ffc667f6
--- 1/app/javascript/mastodon/locales/he.json
--- 2/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 a609a9d4a09e3911206e90963b43289408532d39,6c8283870af51f39033168dc27a352c73768b338..4b64d796dc2d11a3c2b0c7273b6f0b2c3ee32ff3
--- 1/app/javascript/mastodon/locales/hr.json
--- 2/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 253f3fba04b4ddb385eb7663e6dc4be93f3a78ce,1d635490c78517334fcdffe6bcd49c6978b54f8c..79888e41e41eb57ab0cb9848064235662058da67
--- 1/app/javascript/mastodon/locales/hu.json
--- 2/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 bc3ea72e500ccf5e21468015f0a3198c0d95a2e7,6e10024874a74cab647f876547b7e30e643964f9..932ff1565f9668abf473561a085f1cecaf962fbe
--- 1/app/javascript/mastodon/locales/hy.json
--- 2/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 d5223eae6acdbe36c3899230e120fef40167a73f,923dee919c85e2cbbaab309e0d9427b5419d7428..14261f1994a70858999bb2456544fc229f2ffdc4
--- 1/app/javascript/mastodon/locales/id.json
--- 2/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 4728550f0d0129e84ec21f85426fe83ca9079a8d,f174a0c7d61321ed1b3f7d58363f37c4a2a01dc9..5ea982f466f4b3bf8b0ca686d1d2df2f14467a8c
--- 1/app/javascript/mastodon/locales/io.json
--- 2/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 1ee98fbdc1fe92513004dcced74e071f04508342,72e8381f10af8c9c6aea37759b7e3490222047a5..068598de2ec4c878e0190f7d4ccf1191fdafbd1f
--- 1/app/javascript/mastodon/locales/it.json
--- 2/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 c3184191e71cb6856bd3ad94f9d9ddc8af01df76,1001c196ebb0902ecab108b9bc5fc465bd804bef..514a5bf4255ec40e1c4db9c45b1c46b8951e6097
--- 1/app/javascript/mastodon/locales/ja.json
--- 2/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 6dd8e6cb27a29bebfe16bb758538ee65fc2ef910,039f3a4030059d853cd0dc985a9504a3771904b8..532c1f04d0eaa046cd9ab6e2f2dcbc585b31e27a
--- 1/app/javascript/mastodon/locales/ko.json
--- 2/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 d494134f270e9e709eea258fd94da1880e485052,f58d0314bc30b499d7c616d6def4332dc0a1760c..d508d94120d3d63dd66004030ad27dd48d33a95a
--- 1/app/javascript/mastodon/locales/nl.json
--- 2/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 e2095035f9a388d29e2cf3daf07ebbb36053d64e,b82476b0cda397488608d32a5fa3901f1e009eb4..aaad033e29987781f93e8bfaef9c02bd7842c0a6
--- 1/app/javascript/mastodon/locales/no.json
--- 2/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 706c4f6d8fe4041f1a6f8eac7f209d8105ec1150,d6308b864aad1b19350bb8ca75abb60a3d2d34a2..c7a26c1c62a858814e7e280516d9c330c0ffdd6d
--- 1/app/javascript/mastodon/locales/oc.json
--- 2/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 4f3d6c1bb42ada46a06b47e3128899ac72d1f933,b7523f6d89c2ddba9731df178fd02265205ae827..2d6f0c01b71f03ffafafb9a41852dd390a7111af
--- 1/app/javascript/mastodon/locales/pl.json
--- 2/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 eb9865756ac5c3c44f2792d7684cc2df737de603,6416f259855c68da4e68f8e62a77337cf52ef7ef..6bf24c52a6048194922a134f95a5c79c347203ae
--- 1/app/javascript/mastodon/locales/pt-BR.json
--- 2/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 b5f2610fe1ecaef4fa200829d3c4aa78b24a1eaa,5f87fabd79cbf832f9c9185a32f9de7c2f981f06..3b20cf4e6b2213ad1165855ece3a9f6104b51348
--- 1/app/javascript/mastodon/locales/pt.json
--- 2/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 e07f5dc6f082bc8ed2009a73c3f6ed46a650d467,690b8e28a99020477978099fae09842070e4cec1..ec21b5d5598d71e8591db2d4fc67b5d6f3be7980
--- 1/app/javascript/mastodon/locales/ru.json
--- 2/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 eab1c0296d79c58f6a48ae361b4e357d56631eb1,ead0e8e29816c42ad397cbaffbc4df5c71b90a0c..2cb249d2aa7838decf2e0cca365b78964e0d6288
--- 1/app/javascript/mastodon/locales/sk.json
--- 2/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 f2011bd99c2b29feecb2f0d316f1a8f7d8d969d3,7f4e64c20dbb54da48083306eaf93af50bb101c0..c6512cda45912c5e76822d675449ef02e4b21036
--- 1/app/javascript/mastodon/locales/sr-Latn.json
--- 2/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 60f839d488267aebfee4a5b490aafdf4d60569b1,52f756a70fe585eb5b0c05e9cc2f523d4d0da3c4..93fbe5960f1351ab48d8dcf63f3412265bd8dc21
--- 1/app/javascript/mastodon/locales/sr.json
--- 2/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 66ce46055896ab020d5658f511dbcadf9d0db581,1436d23b8b4b880e198034c6d0c30977661a46ca..3451212d01882b0cdace72eb1f9d4592fed42ff1
--- 1/app/javascript/mastodon/locales/sv.json
--- 2/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 489ce436ec4af43b16e0dd50b9a110da24dedec9,5fdbb848ae65ddda4401a6faa38da2a2d5da1c89..95a933b4061d51afb681bd835298873a1e27430b
--- 1/app/javascript/mastodon/locales/th.json
--- 2/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 db67d98808b88beeaa47c0876c677357e53cdfc1,f7903584a197f2d87d242ed58290ca180f1833dc..baaa5c97af03074879bf59bcad13ea82edcb9dc3
--- 1/app/javascript/mastodon/locales/tr.json
--- 2/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 5a40abdd55fcb44ade015fe26ddddf0daad26df5,c2601797a28d7819626901013d576eedf02ce917..1755c55b4d515693bb17f9ef8fa13628fdb39034
--- 1/app/javascript/mastodon/locales/uk.json
--- 2/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 88a362becf6cb39a01f6bb3988e9d240190197fd,bfc4c682a0b59a4e276ff10d074d01bf0a871221..d031c85f3112f8017eb08a828148c6be50e14821
--- 1/app/javascript/mastodon/locales/zh-CN.json
--- 2/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 363f18dcbb1c1af1794bfa84a1892a3ecd8ec25d,403f40eef08179c6b55da0530d8deabe7b955bae..d3ad238ad2883e5a01c462f5c8dc45d43557f12a
--- 1/app/javascript/mastodon/locales/zh-HK.json
--- 2/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 a85903fdbc2fb2b3b699d7d934a351fbf6f57861,1a1b8f3785e55c7fde53420026b377d3224eddde..3a5eade411b07c751a583c48a6af292999115f47
--- 1/app/javascript/mastodon/locales/zh-TW.json
--- 2/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": "封鎖",