Improve messages

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>

src/__fixtures__/intlMessages.json

@@ -95,8 +95,7 @@
     "compose_form.sensitive.marked": "Media is marked as sensitive",
     "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
     "compose_form.spoiler.marked": "Text is hidden behind warning",
-    "compose_form.spoiler.unmarked": "Text is not hidden",
+        "confirmation_modal.cancel": "Cancel",
-      "confirmation_modal.cancel": "Cancel",
     "confirmations.block.block_and_report": "Block & Report",
     "confirmations.block.confirm": "Block",
     "confirmations.block.message": "Are you sure you want to block {name}?",
@@ -573,7 +572,6 @@
   "compose_form.sensitive.marked": "Media is marked as sensitive",
   "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmation_modal.cancel": "Cancel",
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",

src/components/media-gallery.tsx

@@ -631,8 +631,8 @@ const MediaGallery: React.FC<IMediaGallery> = (props) => {
               <div className='mx-auto w-3/4 space-y-4 text-center'>
                 <div className='space-y-1'>
                   <Text theme='white' weight='semibold'>{warning}</Text>
-                  <Text theme='muted' size='sm'>
+                  <Text theme='white' size='sm'>
-                    <FormattedMessage id='status.sensitive_warning.subtitle' defaultMessage='This content may not be suitable for all audiences.' />
+                    <FormattedMessage id='status.sensitive_warning.subtitle' defaultMessage='This content was marked as sensitive by the author.' />
                   </Text>
                 </div>
 

src/components/statuses/sensitive-content-overlay.tsx

@@ -21,7 +21,7 @@ const messages = defineMessages({
   sensitiveTitle: { id: 'status.sensitive_warning', defaultMessage: 'Sensitive content' },
   underReviewTitle: { id: 'moderation_overlay.title', defaultMessage: 'Content Under Review' },
   underReviewSubtitle: { id: 'moderation_overlay.subtitle', defaultMessage: 'This Post has been sent to Moderation for review and is only visible to you. If you believe this is an error please contact Support.' },
-  sensitiveSubtitle: { id: 'status.sensitive_warning.subtitle', defaultMessage: 'This content may not be suitable for all audiences.' },
+  sensitiveSubtitle: { id: 'status.sensitive_warning.subtitle', defaultMessage: 'This content was marked as sensitive by the author.' },
   contact: { id: 'moderation_overlay.contact', defaultMessage: 'Contact' },
   show: { id: 'moderation_overlay.show', defaultMessage: 'Show Content' },
 });

src/locales/cy.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "Ateb i edefyn",
   "status.report": "Adrodd @{name}",
   "status.sensitive_warning": "Cynnwys sensitif",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Rhannu",
   "status.show_less_all": "Dangos llai i bawb",
   "status.show_more_all": "Dangos mwy i bawb",

src/locales/el.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "Απάντησε στην συζήτηση",
   "status.report": "Κατάγγειλε @{name}",
   "status.sensitive_warning": "Ευαίσθητο περιεχόμενο",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Μοιράσου",
   "status.show_less_all": "Δείξε λιγότερα για όλα",
   "status.show_more_all": "Δείξε περισσότερα για όλα",

src/locales/en-Shaw.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "𐑮𐑦𐑐𐑤𐑲 𐑑 𐑔𐑮𐑧𐑛",
   "status.report": "𐑮𐑦𐑐𐑹𐑑 @{name}",
   "status.sensitive_warning": "𐑕𐑧𐑯𐑕𐑦𐑑𐑦𐑝 𐑒𐑪𐑯𐑑𐑧𐑯𐑑",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "𐑖𐑺",
   "status.show_less_all": "𐑖𐑴 𐑤𐑧𐑕 𐑓 𐑷𐑤",
   "status.show_more_all": "𐑖𐑴 𐑥𐑹 𐑓 𐑷𐑤",

src/locales/en.json

@@ -448,7 +448,6 @@
   "compose_form.scheduled_statuses.click_here": "Click here",
   "compose_form.scheduled_statuses.message": "You have scheduled posts. {click_here} to see them.",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "Subject (optional)",
   "compose_form.spoiler_remove": "Remove sensitive",
   "compose_form.spoiler_title": "Sensitive content",
@@ -1511,7 +1510,6 @@
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Share",
   "status.show_filter_reason": "Show anyway",
   "status.show_less_all": "Show less for all",

src/locales/es-AR.json

@@ -1115,7 +1115,6 @@
   "status.replyAll": "Responder al hilo",
   "status.report": "Denunciar a @{name}",
   "status.sensitive_warning": "Contenido sensible",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Compartir",
   "status.show_less_all": "Mostrar menos para todo",
   "status.show_more_all": "Mostrar más para todo",

src/locales/es.json

@@ -1412,7 +1412,6 @@
   "status.replyAll": "Responder al hilo",
   "status.report": "Reportar",
   "status.sensitive_warning": "Contenido sensible",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Compartir",
   "status.show_filter_reason": "Mostrar de todos modos",
   "status.show_less_all": "Mostrar menos para todo",

src/locales/fa.json

@@ -1074,7 +1074,6 @@
   "status.replyAll": "به نوشته پاسخ دهید",
   "status.report": "گزارش دادن @{name}",
   "status.sensitive_warning": "محتوای حساس",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "هم‌رسانی",
   "status.show_less_all": "نمایش کمتر همه",
   "status.show_more_all": "نمایش بیشتر همه",

src/locales/fr.json

@@ -1313,7 +1313,6 @@
   "status.replyAll": "Répondre au fil",
   "status.report": "Signaler @{name}",
   "status.sensitive_warning": "Contenu sensible",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Partager",
   "status.show_less_all": "Tout replier",
   "status.show_more_all": "Tout déplier",

src/locales/ga.json

@@ -290,7 +290,6 @@
   "compose_form.scheduled_statuses.click_here": "Click here",
   "compose_form.scheduled_statuses.message": "You have scheduled posts. {click_here} to see them.",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_remove": "Remove sensitive",
   "compose_form.spoiler_title": "Sensitive content",
   "confirmation_modal.cancel": "Cancel",
@@ -1064,7 +1063,6 @@
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Share",
   "status.show_less_all": "Show less for all",
   "status.show_more_all": "Show more for all",

src/locales/he.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "תגובה לכולם",
   "status.report": "דיווח על @{name}",
   "status.sensitive_warning": "תוכן רגיש",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "שיתוף",
   "status.show_less_all": "הצג פחות לכולם",
   "status.show_more_all": "הראה יותר לכולם",

src/locales/hi.json

@@ -290,7 +290,6 @@
   "compose_form.scheduled_statuses.click_here": "Click here",
   "compose_form.scheduled_statuses.message": "You have scheduled posts. {click_here} to see them.",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_remove": "Remove sensitive",
   "compose_form.spoiler_title": "Sensitive content",
   "confirmation_modal.cancel": "Cancel",
@@ -1064,7 +1063,6 @@
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Share",
   "status.show_less_all": "Show less for all",
   "status.show_more_all": "Show more for all",

src/locales/hr.json

@@ -1235,7 +1235,6 @@
   "status.replyAll": "Odgovori",
   "status.report": "Prijavi @{name}",
   "status.sensitive_warning": "Osjetljiv sadržaj",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Share",
   "status.show_less_all": "Show less for all",
   "status.show_more_all": "Prikaži više za sve",

src/locales/hu.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "Válasz a beszélgetésre",
   "status.report": "@{name} jelentése",
   "status.sensitive_warning": "Szenzitív tartalom",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Megosztás",
   "status.show_less_all": "Kevesebbet mindenhol",
   "status.show_more_all": "Többet mindenhol",

src/locales/id.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "Balas ke semua",
   "status.report": "Laporkan @{name}",
   "status.sensitive_warning": "Konten sensitif",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Share",
   "status.show_less_all": "Show less for all",
   "status.show_more_all": "Show more for all",

src/locales/io.json

@@ -290,7 +290,6 @@
   "compose_form.scheduled_statuses.click_here": "Click here",
   "compose_form.scheduled_statuses.message": "You have scheduled posts. {click_here} to see them.",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "Averto di kontenajo",
   "compose_form.spoiler_remove": "Remove sensitive",
   "compose_form.spoiler_title": "Sensitive content",
@@ -1065,7 +1064,6 @@
   "status.replyAll": "Respondar a filo",
   "status.report": "Denuncar @{name}",
   "status.sensitive_warning": "Trubliva kontenajo",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Share",
   "status.show_less_all": "Show less for all",
   "status.show_more_all": "Show more for all",

src/locales/is.json

@@ -1066,7 +1066,6 @@
   "status.replyAll": "Svara þræði",
   "status.report": "Kæra @{name}",
   "status.sensitive_warning": "Viðkvæmt efni",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Deila",
   "status.show_less_all": "Sýna minna fyrir allt",
   "status.show_more_all": "Sýna meira fyrir allt",

src/locales/ja.json

@@ -1124,7 +1124,6 @@
   "status.replyAll": "全員に返信",
   "status.report": "@{name}さんを通報",
   "status.sensitive_warning": "閲覧注意",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "共有",
   "status.show_less_all": "全て隠す",
   "status.show_more_all": "全て見る",

src/locales/kk.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "Тақырыпқа жауап",
   "status.report": "Шағым @{name}",
   "status.sensitive_warning": "Нәзік контент",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Бөлісу",
   "status.show_less_all": "Бәрін аздап көрсет",
   "status.show_more_all": "Бәрін толығымен",

src/locales/ko.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "전원에게 답장",
   "status.report": "신고",
   "status.sensitive_warning": "민감한 미디어",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "공유",
   "status.show_less_all": "모두 접기",
   "status.show_more_all": "모두 펼치기",

src/locales/lt.json

@@ -290,7 +290,6 @@
   "compose_form.scheduled_statuses.click_here": "Click here",
   "compose_form.scheduled_statuses.message": "You have scheduled posts. {click_here} to see them.",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_remove": "Remove sensitive",
   "compose_form.spoiler_title": "Sensitive content",
   "confirmation_modal.cancel": "Cancel",
@@ -1064,7 +1063,6 @@
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Share",
   "status.show_less_all": "Show less for all",
   "status.show_more_all": "Show more for all",

src/locales/lv.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Share",
   "status.show_less_all": "Show less for all",
   "status.show_more_all": "Show more for all",

src/locales/mk.json

@@ -290,7 +290,6 @@
   "compose_form.scheduled_statuses.click_here": "Click here",
   "compose_form.scheduled_statuses.message": "You have scheduled posts. {click_here} to see them.",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_remove": "Remove sensitive",
   "compose_form.spoiler_title": "Sensitive content",
   "confirmation_modal.cancel": "Cancel",
@@ -1064,7 +1063,6 @@
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Share",
   "status.show_less_all": "Show less for all",
   "status.show_more_all": "Show more for all",

src/locales/ms.json

@@ -290,7 +290,6 @@
   "compose_form.scheduled_statuses.click_here": "Click here",
   "compose_form.scheduled_statuses.message": "You have scheduled posts. {click_here} to see them.",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_remove": "Remove sensitive",
   "compose_form.spoiler_title": "Sensitive content",
   "confirmation_modal.cancel": "Cancel",
@@ -1064,7 +1063,6 @@
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Share",
   "status.show_less_all": "Show less for all",
   "status.show_more_all": "Show more for all",

src/locales/nn.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Share",
   "status.show_less_all": "Show less for all",
   "status.show_more_all": "Show more for all",

src/locales/oc.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "Respondre a la conversacion",
   "status.report": "Senhalar @{name}",
   "status.sensitive_warning": "Contengut sensible",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Partejar",
   "status.show_less_all": "Los tornar plegar totes",
   "status.show_more_all": "Los desplegar totes",

src/locales/pt-BR.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "Responder à sequência",
   "status.report": "Denunciar @{name}",
   "status.sensitive_warning": "Conteúdo sensível",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Compartilhar",
   "status.show_less_all": "Mostrar menos para todas as mensagens",
   "status.show_more_all": "Mostrar mais para todas as mensagens",

src/locales/pt.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "Responder à conversa",
   "status.report": "Denunciar @{name}",
   "status.sensitive_warning": "Conteúdo sensível",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Partilhar",
   "status.show_less_all": "Mostrar menos para todas",
   "status.show_more_all": "Mostrar mais para todas",

src/locales/ro.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "Răspunde la topic",
   "status.report": "Raportează @{name}",
   "status.sensitive_warning": "Conținut sensibil",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Distribuie",
   "status.show_less_all": "Arată mai puțin pentru toți",
   "status.show_more_all": "Arată mai mult pentru toți",

src/locales/ru.json

@@ -1142,7 +1142,6 @@
   "status.replyAll": "Ответить всем",
   "status.report": "Пожаловаться",
   "status.sensitive_warning": "Чувствительный контент",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Поделиться",
   "status.show_less_all": "Свернуть для всех",
   "status.show_more_all": "Развернуть для всех",

src/locales/sk.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "Odpovedz na diskusiu",
   "status.report": "Nahlás @{name}",
   "status.sensitive_warning": "Chúlostivý obsah",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Zdieľaj",
   "status.show_less_all": "Všetkým ukáž menej",
   "status.show_more_all": "Všetkým ukáž viac",

src/locales/sl.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "Odgovori na objavo",
   "status.report": "Prijavi @{name}",
   "status.sensitive_warning": "Občutljiva vsebina",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Deli",
   "status.show_less_all": "Prikaži manj za vse",
   "status.show_more_all": "Prikaži več za vse",

src/locales/sr-Latn.json

@@ -290,7 +290,6 @@
   "compose_form.scheduled_statuses.click_here": "Click here",
   "compose_form.scheduled_statuses.message": "You have scheduled posts. {click_here} to see them.",
   "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",
   "compose_form.spoiler_remove": "Remove sensitive",
   "compose_form.spoiler_title": "Sensitive content",
@@ -1065,7 +1064,6 @@
   "status.replyAll": "Odgovori na diskusiju",
   "status.report": "Prijavi korisnika @{name}",
   "status.sensitive_warning": "Osetljiv sadržaj",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Podeli",
   "status.show_less_all": "Show less for all",
   "status.show_more_all": "Show more for all",

src/locales/sr.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "Одговори на дискусију",
   "status.report": "Пријави корисника @{name}",
   "status.sensitive_warning": "Осетљив садржај",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Подели",
   "status.show_less_all": "Прикажи мање за све",
   "status.show_more_all": "Прикажи више за све",

src/locales/sv.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "Svara på tråden",
   "status.report": "Rapportera @{name}",
   "status.sensitive_warning": "Känsligt innehåll",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Dela",
   "status.show_less_all": "Visa mindre för alla",
   "status.show_more_all": "Visa mer för alla",

src/locales/ta.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "நூலுக்கு பதிலளிக்கவும்",
   "status.report": "Report @{name}",
   "status.sensitive_warning": "உணர்திறன் உள்ளடக்கம்",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "பங்கிடு",
   "status.show_less_all": "அனைத்தையும் குறைவாக காட்டு",
   "status.show_more_all": "அனைவருக்கும் மேலும் காட்டு",

src/locales/te.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "సంభాషణకు ప్రత్యుత్తరం ఇవ్వండి",
   "status.report": "@{name}పై ఫిర్యాదుచేయు",
   "status.sensitive_warning": "సున్నితమైన కంటెంట్",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "పంచుకోండి",
   "status.show_less_all": "అన్నిటికీ తక్కువ చూపించు",
   "status.show_more_all": "అన్నిటికీ ఇంకా చూపించు",

src/locales/th.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "ตอบกลับกระทู้",
   "status.report": "รายงาน @{name}",
   "status.sensitive_warning": "เนื้อหาที่ละเอียดอ่อน",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "แบ่งปัน",
   "status.show_less_all": "แสดงน้อยลงทั้งหมด",
   "status.show_more_all": "แสดงเพิ่มเติมทั้งหมด",

src/locales/uk.json

@@ -1065,7 +1065,6 @@
   "status.replyAll": "Відповісти на ланцюжок",
   "status.report": "Поскаржитися на @{name}",
   "status.sensitive_warning": "Дражливий зміст",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
   "status.share": "Поділитися",
   "status.show_less_all": "Show less for all",
   "status.show_more_all": "Show more for all",