From 18241ccbe1778f67f657c8346a2dda1b131ee852 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> Date: Tue, 13 Mar 2018 16:10:12 +0900 Subject: [PATCH] Change the title of sensitive button by state (#6771) Icon showing the state may be confusing. (does the slahed eye icon mean the state that it is sensitive, or to mark it as sensitive?) Moreover, it may not help for blind people. The title will give the precise representation of the current state. --- .../compose/containers/sensitive_button_container.js | 5 +++-- app/javascript/mastodon/locales/ar.json | 3 ++- app/javascript/mastodon/locales/bg.json | 3 ++- app/javascript/mastodon/locales/ca.json | 3 ++- app/javascript/mastodon/locales/de.json | 3 ++- app/javascript/mastodon/locales/defaultMessages.json | 8 ++++++-- app/javascript/mastodon/locales/en.json | 3 ++- app/javascript/mastodon/locales/eo.json | 3 ++- app/javascript/mastodon/locales/es.json | 3 ++- app/javascript/mastodon/locales/fa.json | 3 ++- app/javascript/mastodon/locales/fi.json | 3 ++- app/javascript/mastodon/locales/fr.json | 3 ++- app/javascript/mastodon/locales/gl.json | 3 ++- app/javascript/mastodon/locales/he.json | 3 ++- app/javascript/mastodon/locales/hr.json | 3 ++- app/javascript/mastodon/locales/hu.json | 3 ++- app/javascript/mastodon/locales/hy.json | 3 ++- app/javascript/mastodon/locales/id.json | 3 ++- app/javascript/mastodon/locales/io.json | 3 ++- app/javascript/mastodon/locales/it.json | 3 ++- app/javascript/mastodon/locales/ja.json | 3 ++- app/javascript/mastodon/locales/ko.json | 3 ++- app/javascript/mastodon/locales/nl.json | 3 ++- app/javascript/mastodon/locales/no.json | 3 ++- app/javascript/mastodon/locales/oc.json | 3 ++- app/javascript/mastodon/locales/pl.json | 3 ++- app/javascript/mastodon/locales/pt-BR.json | 3 ++- app/javascript/mastodon/locales/pt.json | 3 ++- app/javascript/mastodon/locales/ru.json | 3 ++- app/javascript/mastodon/locales/sk.json | 3 ++- app/javascript/mastodon/locales/sr-Latn.json | 3 ++- app/javascript/mastodon/locales/sr.json | 3 ++- app/javascript/mastodon/locales/sv.json | 3 ++- app/javascript/mastodon/locales/th.json | 3 ++- app/javascript/mastodon/locales/tr.json | 3 ++- app/javascript/mastodon/locales/uk.json | 3 ++- app/javascript/mastodon/locales/zh-CN.json | 3 ++- app/javascript/mastodon/locales/zh-HK.json | 3 ++- app/javascript/mastodon/locales/zh-TW.json | 3 ++- 39 files changed, 83 insertions(+), 41 deletions(-) diff --git a/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js b/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js index c8e74f5a1a..43de8f213e 100644 --- a/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js +++ b/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js @@ -9,7 +9,8 @@ import spring from 'react-motion/lib/spring'; import { injectIntl, defineMessages } from 'react-intl'; const messages = defineMessages({ - title: { id: 'compose_form.sensitive', defaultMessage: 'Mark media as sensitive' }, + marked: { id: 'compose_form.sensitive.marked', defaultMessage: 'Media is marked as sensitive' }, + unmarked: { id: 'compose_form.sensitive.unmarked', defaultMessage: 'Media is not marked as sensitive' }, }); const mapStateToProps = state => ({ @@ -50,7 +51,7 @@ class SensitiveButton extends React.PureComponent { <div className={className} style={{ transform: `scale(${scale})` }}> <IconButton className='compose-form__sensitive-button__icon' - title={intl.formatMessage(messages.title)} + title={intl.formatMessage(active ? messages.marked : messages.unmarked)} icon={icon} onClick={onClick} size={18} diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json index 397927abbd..9898adc130 100644 --- a/app/javascript/mastodon/locales/ar.json +++ b/app/javascript/mastodon/locales/ar.json @@ -60,7 +60,8 @@ "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_placeholder": "تنبيه عن المØتوى", "confirmation_modal.cancel": "إلغاء", diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json index 673ce0bc32..0c0ead0f85 100644 --- a/app/javascript/mastodon/locales/bg.json +++ b/app/javascript/mastodon/locales/bg.json @@ -60,7 +60,8 @@ "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_placeholder": "Content warning", "confirmation_modal.cancel": "Cancel", diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index 318b36c966..d080227bd0 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -60,7 +60,8 @@ "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_placeholder": "Escriu l'avÃs aquÃ", "confirmation_modal.cancel": "Cancel·la", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index 92dc51be0b..f20d13bc1e 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -60,7 +60,8 @@ "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_placeholder": "Inhaltswarnung", "confirmation_modal.cancel": "Abbrechen", diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index cd64ae26e7..1b8111307c 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -768,8 +768,12 @@ { "descriptors": [ { - "defaultMessage": "Mark media as sensitive", - "id": "compose_form.sensitive" + "defaultMessage": "Media is marked as sensitive", + "id": "compose_form.sensitive.marked" + }, + { + "defaultMessage": "Media is not marked as sensitive", + "id": "compose_form.sensitive.unmarked" } ], "path": "app/javascript/mastodon/features/compose/containers/sensitive_button_container.json" diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 3a5daee210..cabfff04ad 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -60,7 +60,8 @@ "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_placeholder": "Write your warning here", "confirmation_modal.cancel": "Cancel", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index 03719963f6..e8cea8da5b 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -60,7 +60,8 @@ "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_placeholder": "Skribu vian averton ĉi tie", "confirmation_modal.cancel": "Nuligi", diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index 8ecb81ddfd..f857f38a7c 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -60,7 +60,8 @@ "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_placeholder": "Advertencia de contenido", "confirmation_modal.cancel": "Cancelar", diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index 50aa12a05b..85f5c1e44a 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -60,7 +60,8 @@ "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_placeholder": "هشدار Ù…Øتوا", "confirmation_modal.cancel": "بی‌خیال", diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json index f4d730c0c4..3838bcafd8 100644 --- a/app/javascript/mastodon/locales/fi.json +++ b/app/javascript/mastodon/locales/fi.json @@ -60,7 +60,8 @@ "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_placeholder": "Content warning", "confirmation_modal.cancel": "Peruuta", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index 2140ee506f..aaa70c1b3a 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -60,7 +60,8 @@ "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_placeholder": "Écrivez ici votre avertissement", "confirmation_modal.cancel": "Annuler", diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json index 3c74ba4000..553501cb7a 100644 --- a/app/javascript/mastodon/locales/gl.json +++ b/app/javascript/mastodon/locales/gl.json @@ -60,7 +60,8 @@ "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_placeholder": "Escriba o aviso aquÃ", "confirmation_modal.cancel": "Cancelar", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index 8e784b171e..7ad7fcb0a3 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -60,7 +60,8 @@ "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_placeholder": "×זהרת תוכן", "confirmation_modal.cancel": "ביטול", diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json index 70d89091ea..a609a9d4a0 100644 --- a/app/javascript/mastodon/locales/hr.json +++ b/app/javascript/mastodon/locales/hr.json @@ -60,7 +60,8 @@ "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_placeholder": "Upozorenje o sadržaju", "confirmation_modal.cancel": "Otkaži", diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index 087305a9a5..253f3fba04 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -60,7 +60,8 @@ "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_placeholder": "Figyelmeztetését Ãrja ide", "confirmation_modal.cancel": "Bezár", diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json index 7849d6941f..bc3ea72e50 100644 --- a/app/javascript/mastodon/locales/hy.json +++ b/app/javascript/mastodon/locales/hy.json @@ -60,7 +60,8 @@ "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_placeholder": "Ô³Ö€Õ«Ö€ Õ¶Õ¡ÕÕ¡Õ¦Õ£Õ¸Ö‚Õ·Õ¡ÖÕ¸Ö‚Õ´Õ¤ Õ¡ÕµÕ½Õ¿Õ¥Õ²", "confirmation_modal.cancel": "Õ‰Õ¥Õ²Õ¡Ö€Õ¯Õ¥Õ¬", diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json index 6b00d79b69..d5223eae6a 100644 --- a/app/javascript/mastodon/locales/id.json +++ b/app/javascript/mastodon/locales/id.json @@ -60,7 +60,8 @@ "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_placeholder": "Peringatan konten", "confirmation_modal.cancel": "Batal", diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json index d51b240903..4728550f0d 100644 --- a/app/javascript/mastodon/locales/io.json +++ b/app/javascript/mastodon/locales/io.json @@ -60,7 +60,8 @@ "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_placeholder": "Averto di kontenajo", "confirmation_modal.cancel": "Cancel", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index 0babc7c025..1ee98fbdc1 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -60,7 +60,8 @@ "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_placeholder": "Content warning", "confirmation_modal.cancel": "Cancel", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 254848f595..c3184191e7 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -60,7 +60,8 @@ "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_placeholder": "ã“ã“ã«è¦å‘Šã‚’書ã„ã¦ãã ã•ã„", "confirmation_modal.cancel": "ã‚ャンセル", diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index 4c56d2a45d..6dd8e6cb27 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -60,7 +60,8 @@ "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_placeholder": "ê²½ê³ ", "confirmation_modal.cancel": "취소", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index 8906f73516..d494134f27 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -60,7 +60,8 @@ "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_placeholder": "Waarschuwingstekst", "confirmation_modal.cancel": "Annuleren", diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json index b14ecaeddb..e2095035f9 100644 --- a/app/javascript/mastodon/locales/no.json +++ b/app/javascript/mastodon/locales/no.json @@ -60,7 +60,8 @@ "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_placeholder": "Innholdsadvarsel", "confirmation_modal.cancel": "Avbryt", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index c3d8bcf37a..706c4f6d8f 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -60,7 +60,8 @@ "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_placeholder": "Escrivètz l’avertiment aquÃ", "confirmation_modal.cancel": "Anullar", diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index 2f39bd8500..4f3d6c1bb4 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -60,7 +60,8 @@ "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_placeholder": "Wprowadź swoje ostrzeżenie o zawartoÅ›ci", "confirmation_modal.cancel": "Anuluj", diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index 67b36fdf21..eb9865756a 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -60,7 +60,8 @@ "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_placeholder": "Aviso de conteúdo", "confirmation_modal.cancel": "Cancelar", diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json index 014884637e..b5f2610fe1 100644 --- a/app/javascript/mastodon/locales/pt.json +++ b/app/javascript/mastodon/locales/pt.json @@ -60,7 +60,8 @@ "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_placeholder": "Aviso de conteúdo", "confirmation_modal.cancel": "Cancelar", diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json index 88152a8859..e07f5dc6f0 100644 --- a/app/javascript/mastodon/locales/ru.json +++ b/app/javascript/mastodon/locales/ru.json @@ -60,7 +60,8 @@ "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_placeholder": "Ðапишите Ñвое предупреждение здеÑÑŒ", "confirmation_modal.cancel": "Отмена", diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index 4ff34012e2..eab1c0296d 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -60,7 +60,8 @@ "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_placeholder": "Sem napÃÅ¡te vaÅ¡e varovanie", "confirmation_modal.cancel": "ZruÅ¡iÅ¥", diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json index fc4d0cdc92..f2011bd99c 100644 --- a/app/javascript/mastodon/locales/sr-Latn.json +++ b/app/javascript/mastodon/locales/sr-Latn.json @@ -60,7 +60,8 @@ "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_placeholder": "Ovde upiÅ¡ite upozorenje", "confirmation_modal.cancel": "PoniÅ¡ti", diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json index ae496d7cc6..60f839d488 100644 --- a/app/javascript/mastodon/locales/sr.json +++ b/app/javascript/mastodon/locales/sr.json @@ -60,7 +60,8 @@ "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_placeholder": "Овде упишите упозорење", "confirmation_modal.cancel": "Поништи", diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json index e72280136c..66ce460558 100644 --- a/app/javascript/mastodon/locales/sv.json +++ b/app/javascript/mastodon/locales/sv.json @@ -60,7 +60,8 @@ "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_placeholder": "Skriv din varning här", "confirmation_modal.cancel": "Ã…ngra", diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json index 617f4fb780..489ce436ec 100644 --- a/app/javascript/mastodon/locales/th.json +++ b/app/javascript/mastodon/locales/th.json @@ -60,7 +60,8 @@ "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_placeholder": "Content warning", "confirmation_modal.cancel": "Cancel", diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json index 499281ae5c..db67d98808 100644 --- a/app/javascript/mastodon/locales/tr.json +++ b/app/javascript/mastodon/locales/tr.json @@ -60,7 +60,8 @@ "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_placeholder": "İçerik uyarısı", "confirmation_modal.cancel": "Ä°ptal", diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json index ff458eb4b3..5a40abdd55 100644 --- a/app/javascript/mastodon/locales/uk.json +++ b/app/javascript/mastodon/locales/uk.json @@ -60,7 +60,8 @@ "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_placeholder": "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ñ‰Ð¾Ð´Ð¾ прихованого текÑту", "confirmation_modal.cancel": "Відмінити", diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index d7a08bd17d..88a362becf 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -60,7 +60,8 @@ "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_placeholder": "折å 部分的è¦å‘Šæ¶ˆæ¯", "confirmation_modal.cancel": "å–消", diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json index a02edc2faa..363f18dcbb 100644 --- a/app/javascript/mastodon/locales/zh-HK.json +++ b/app/javascript/mastodon/locales/zh-HK.json @@ -60,7 +60,8 @@ "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_placeholder": "æ•æ„Ÿè¦å‘Šè¨Šæ¯", "confirmation_modal.cancel": "å–消", diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json index 7e61ff32cb..a85903fdbc 100644 --- a/app/javascript/mastodon/locales/zh-TW.json +++ b/app/javascript/mastodon/locales/zh-TW.json @@ -60,7 +60,8 @@ "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_placeholder": "內容è¦å‘Š", "confirmation_modal.cancel": "å–消", -- GitLab