]> cat aescling's git repositories - mastodon.git/commitdiff
Change defaultMessage for spoiler placeholder (#4329)
authorYamagishi Kazutoshi <ykzts@desire.sh>
Mon, 24 Jul 2017 12:49:06 +0000 (21:49 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 24 Jul 2017 12:49:06 +0000 (14:49 +0200)
33 files changed:
app/javascript/mastodon/features/compose/components/compose_form.js
app/javascript/mastodon/locales/ar.json
app/javascript/mastodon/locales/bg.json
app/javascript/mastodon/locales/ca.json
app/javascript/mastodon/locales/de.json
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/eo.json
app/javascript/mastodon/locales/es.json
app/javascript/mastodon/locales/fa.json
app/javascript/mastodon/locales/fi.json
app/javascript/mastodon/locales/fr.json
app/javascript/mastodon/locales/he.json
app/javascript/mastodon/locales/hr.json
app/javascript/mastodon/locales/hu.json
app/javascript/mastodon/locales/id.json
app/javascript/mastodon/locales/io.json
app/javascript/mastodon/locales/it.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/ko.json
app/javascript/mastodon/locales/nl.json
app/javascript/mastodon/locales/no.json
app/javascript/mastodon/locales/oc.json
app/javascript/mastodon/locales/pl.json
app/javascript/mastodon/locales/pt-BR.json
app/javascript/mastodon/locales/pt.json
app/javascript/mastodon/locales/ru.json
app/javascript/mastodon/locales/th.json
app/javascript/mastodon/locales/tr.json
app/javascript/mastodon/locales/uk.json
app/javascript/mastodon/locales/zh-CN.json
app/javascript/mastodon/locales/zh-HK.json
app/javascript/mastodon/locales/zh-TW.json

index 98e82355502faeb11e495ef09d646a7ff2154e15..4400c89c8f6dba2c7c8bd450092d26aa0eda9c67 100644 (file)
@@ -20,7 +20,7 @@ import { length } from 'stringz';
 
 const messages = defineMessages({
   placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' },
-  spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Content warning' },
+  spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' },
   publish: { id: 'compose_form.publish', defaultMessage: 'Toot' },
   publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}!' },
 });
index 0043e66677e513c0b91095aeea78a1824fa082d4..89ddb2d154e09ad41d10fcfbbe4092c8a7c40953 100644 (file)
   "privacy.unlisted.long": "لا تقم بإدراجه على الخيوط العامة",
   "privacy.unlisted.short": "غير مدرج",
   "reply_indicator.cancel": "إلغاء",
-  "report.heading": "New report",
   "report.placeholder": "تعليقات إضافية",
   "report.submit": "إرسال",
   "report.target": "إبلاغ",
index 6e65177339f683d79271c20e4bcd76f10297e78e..3dba91b822b6ae172a1a48f7a03d02d84b2ab5ca 100644 (file)
   "privacy.unlisted.long": "Do not show in public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Отказ",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
index bacb1c9919db409454621e63c786a6b0d70c4bdb..54f2e5e221cf6889827b4c535aac08675a46aad8 100644 (file)
   "privacy.unlisted.long": "No publicar en línies de temps públiques",
   "privacy.unlisted.short": "No llistat",
   "reply_indicator.cancel": "Cancel·lar",
-  "report.heading": "New report",
   "report.placeholder": "Comentaris addicionals",
   "report.submit": "Enviar",
   "report.target": "Informes",
index 0f192d4b6fc26e47aa34d3282448957e107af7ed..a041e66550933d3452cc8a86719108460e72e116 100644 (file)
   "privacy.unlisted.long": "Nicht in öffentlichen Zeitleisten anzeigen",
   "privacy.unlisted.short": "Nicht gelistet",
   "reply_indicator.cancel": "Abbrechen",
-  "report.heading": "New report",
   "report.placeholder": "Zusätzliche Kommentare",
   "report.submit": "Absenden",
   "report.target": "Melden",
index 70769361274c8b70d08133766201dfccf6395b0c..a50c8b33888b2f772947046949b92425f87c2589 100644 (file)
         "id": "compose_form.placeholder"
       },
       {
-        "defaultMessage": "Content warning",
+        "defaultMessage": "Write your warning here",
         "id": "compose_form.spoiler_placeholder"
       },
       {
     ],
     "path": "app/javascript/mastodon/features/public_timeline/index.json"
   },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "New report",
-        "id": "report.heading"
-      },
-      {
-        "defaultMessage": "Additional comments",
-        "id": "report.placeholder"
-      },
-      {
-        "defaultMessage": "Submit",
-        "id": "report.submit"
-      },
-      {
-        "defaultMessage": "Reporting",
-        "id": "report.target"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/report/index.json"
-  },
   {
     "descriptors": [
       {
index 0a318f6fa8d7ea701d93ac524c606cf909c5ae5f..b6e92dda0fb913811bdf532cf5e64d14eb7c0970 100644 (file)
   "privacy.unlisted.long": "Do not post to public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Cancel",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting {target}",
index cfc76517cbb41ddf6a647f53159ed959cbe9af8d..029cef883dfca2ea85e44c22798d305335155da4 100644 (file)
   "privacy.unlisted.long": "Do not show in public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Rezigni",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
index fb7186051c78b3a8a6d565b1c1b76fa5d7577fec..36ad66aceba4c9ff1e6490138a27fab4bfafa86b 100644 (file)
   "privacy.unlisted.long": "No mostrar en la historia federada",
   "privacy.unlisted.short": "Sin federar",
   "reply_indicator.cancel": "Cancelar",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
index f7a64d3499af7a85dc6f6c30f90ed3261fd37580..113daef77b7ca2abc5b22744815991f14da9e75c 100644 (file)
   "privacy.unlisted.long": "عمومی، ولی فهرست نکن",
   "privacy.unlisted.short": "فهرست‌نشده",
   "reply_indicator.cancel": "لغو",
-  "report.heading": "New report",
   "report.placeholder": "توضیح اضافه",
   "report.submit": "بفرست",
   "report.target": "گزارش‌دادن",
index 33691c671788aebd7d5785f2af0cbc4f9e93611a..da9e5d0f28ed3fbcabaa81571d94bbe6f9473793 100644 (file)
   "privacy.unlisted.long": "Do not show in public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Peruuta",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
index b7e9b3390e35713f68a3ad013df56311d11623a7..5b734a2533dfaeba1af739dc20877c9291fa98ce 100644 (file)
   "privacy.unlisted.long": "Ne pas afficher dans les fils publics",
   "privacy.unlisted.short": "Non-listé",
   "reply_indicator.cancel": "Annuler",
-  "report.heading": "New report",
   "report.placeholder": "Commentaires additionnels",
   "report.submit": "Envoyer",
   "report.target": "Signalement",
index 8e92668f601dc0fb35e45be2fa7b86025d5c5f49..c8dc4fe8dbd6c976d77a2e6fde02090f9f330b31 100644 (file)
   "privacy.unlisted.long": "לא יופיע בפידים הציבוריים המשותפים",
   "privacy.unlisted.short": "לא לפיד הכללי",
   "reply_indicator.cancel": "ביטול",
-  "report.heading": "New report",
   "report.placeholder": "הערות נוספות",
   "report.submit": "שליחה",
   "report.target": "דיווח",
index 78fe33dcc250c3eefcae6bd6bdb7847cadbf81c9..fd669b2b27a05ebe086d95e91f4485b00f60c4d6 100644 (file)
   "privacy.unlisted.long": "Ne prikazuj u javnim timelineovima",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Otkaži",
-  "report.heading": "New report",
   "report.placeholder": "Dodatni komentari",
   "report.submit": "Pošalji",
   "report.target": "Prijavljivanje",
index 0b3ee085cf9680a33c54a8f4d1f0ed70438eef92..b3672cb7a4009a700e2a7b62a7388d1a2ef40c86 100644 (file)
   "privacy.unlisted.long": "Do not show in public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Mégsem",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
index cff7ee26128c285b7c9d803b8eaeacafbe28b10b..8a17262fe80f6998923beb60e4cb93fa6451c8c8 100644 (file)
   "privacy.unlisted.long": "Tidak ditampilkan di linimasa publik",
   "privacy.unlisted.short": "Tak Terdaftar",
   "reply_indicator.cancel": "Batal",
-  "report.heading": "New report",
   "report.placeholder": "Komentar tambahan",
   "report.submit": "Kirim",
   "report.target": "Melaporkan",
index b9287081ab15cd5762aacfab4a7f74c91dfc138f..154ca66ceea36ed7f0d39783e25f49f3c89ca43e 100644 (file)
   "privacy.unlisted.long": "Ne montrar en publika tempolinei",
   "privacy.unlisted.short": "Ne enlistigota",
   "reply_indicator.cancel": "Nihiligar",
-  "report.heading": "New report",
   "report.placeholder": "Plusa komenti",
   "report.submit": "Sendar",
   "report.target": "Denuncante",
index e00df67fe64b2676a98c4e48b20a583a586fed51..6cb274bae9c07027945c11d5be82e8894a0aaab3 100644 (file)
   "privacy.unlisted.long": "Non mostrare sulla timeline pubblica",
   "privacy.unlisted.short": "Non elencato",
   "reply_indicator.cancel": "Annulla",
-  "report.heading": "New report",
   "report.placeholder": "Commenti aggiuntivi",
   "report.submit": "Invia",
   "report.target": "Invio la segnalazione",
index bd2455d81ec3e9fa64459c9e6dccb8edce106b31..c52f8c2bbaa60f708511610c4046820cdf3cf97f 100644 (file)
   "privacy.unlisted.long": "公開TLで表示しない",
   "privacy.unlisted.short": "未収載",
   "reply_indicator.cancel": "キャンセル",
-  "report.heading": "New report",
   "report.placeholder": "コメント",
   "report.submit": "通報する",
   "report.target": "問題のユーザー",
index b1bbbe4db4be7e0be9c36831d7badc76df1eb17e..fbd0098d756abfdc9716c0f4b2f95d70df019e7d 100644 (file)
   "privacy.unlisted.long": "공개 타임라인에 표시하지 않음",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "취소",
-  "report.heading": "New report",
   "report.placeholder": "코멘트",
   "report.submit": "신고하기",
   "report.target": "문제가 된 사용자",
index 70e13448257b7c7118a2331771ddf484105c2fb1..f7b0bbf68ae65a9ed5dd00fc09e55c48c70f133d 100644 (file)
   "privacy.unlisted.long": "Niet op openbare tijdlijnen tonen",
   "privacy.unlisted.short": "Minder openbaar",
   "reply_indicator.cancel": "Annuleren",
-  "report.heading": "New report",
   "report.placeholder": "Extra opmerkingen",
   "report.submit": "Verzenden",
   "report.target": "Rapporteren van",
index 1ed213625a67877b065a1dcf7c8a0b15065f2465..98f59f7740adf1f8aefc0f2774892f944b72aa15 100644 (file)
   "privacy.unlisted.long": "Ikke vis i offentlige tidslinjer",
   "privacy.unlisted.short": "Uoppført",
   "reply_indicator.cancel": "Avbryt",
-  "report.heading": "New report",
   "report.placeholder": "Tilleggskommentarer",
   "report.submit": "Send inn",
   "report.target": "Rapporterer",
index 6b42f4d4f2f77270e588fc9860fbb008c3017518..34469deac18c43a639a651bd98cbcd8029dab5ae 100644 (file)
   "privacy.unlisted.long": "Mostrar pas dins los fluxes publics",
   "privacy.unlisted.short": "Pas-listat",
   "reply_indicator.cancel": "Anullar",
-  "report.heading": "New report",
   "report.placeholder": "Comentaris addicionals",
   "report.submit": "Mandar",
   "report.target": "Senhalar {target}",
index 109a004a6a13c70ec8151669d38eaa8cb26ea00f..92782ec2a092de448b75bd7ad43703f4ecb901a0 100644 (file)
   "privacy.unlisted.long": "Niewidoczne na publicznych osiach czasu",
   "privacy.unlisted.short": "Niewidoczne",
   "reply_indicator.cancel": "Anuluj",
-  "report.heading": "Nowe zgłoszenie",
   "report.placeholder": "Dodatkowe komentarze",
   "report.submit": "Wyślij",
   "report.target": "Zgłaszanie {target}",
index d46393cc06dfc0d41b56d0b43f9065dd7dcc2800..3944e33e9ce07f0da724557a32163bdb378d766c 100644 (file)
   "privacy.unlisted.long": "Não publicar nos feeds públicos",
   "privacy.unlisted.short": "Não listar",
   "reply_indicator.cancel": "Cancelar",
-  "report.heading": "New report",
   "report.placeholder": "Comentários adicionais",
   "report.submit": "Enviar",
   "report.target": "Denunciar",
index d46393cc06dfc0d41b56d0b43f9065dd7dcc2800..3944e33e9ce07f0da724557a32163bdb378d766c 100644 (file)
   "privacy.unlisted.long": "Não publicar nos feeds públicos",
   "privacy.unlisted.short": "Não listar",
   "reply_indicator.cancel": "Cancelar",
-  "report.heading": "New report",
   "report.placeholder": "Comentários adicionais",
   "report.submit": "Enviar",
   "report.target": "Denunciar",
index 3075efa94ec75f23cb84d00af72dda3fc8afafab..9e8573efa57f7a88169d4f3b5ff7cbeb0c0811f4 100644 (file)
   "privacy.unlisted.long": "Не показывать в лентах",
   "privacy.unlisted.short": "Скрытый",
   "reply_indicator.cancel": "Отмена",
-  "report.heading": "New report",
   "report.placeholder": "Комментарий",
   "report.submit": "Отправить",
   "report.target": "Жалуемся на",
index a59377c7d36490aa54958456c128ef21f1192273..63bed6d8c1fb25e566c021bbbc6e892118fd90be 100644 (file)
   "privacy.unlisted.long": "Do not post to public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Cancel",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
index 4820e017c4a9383398b8e2a36f1762dc3f19fe03..5bd308e95243f7f8b8d7f174e67d7651b04bed48 100644 (file)
   "privacy.unlisted.long": "Herkese açık zaman tüneline gönderme",
   "privacy.unlisted.short": "Listelenmemiş",
   "reply_indicator.cancel": "İptal",
-  "report.heading": "New report",
   "report.placeholder": "Ek yorumlar",
   "report.submit": "Gönder",
   "report.target": "Raporlama",
index 923332c62a4d962abec4ade00b5fcceb7c654d48..e1611505dec228077127247545c68cd265f4427b 100644 (file)
   "privacy.unlisted.long": "Не показувати у публічних стрічках",
   "privacy.unlisted.short": "Прихований",
   "reply_indicator.cancel": "Відмінити",
-  "report.heading": "New report",
   "report.placeholder": "Додаткові коментарі",
   "report.submit": "Відправити",
   "report.target": "Скаржимося на",
index 4d8b0fb8ec6d8cadaab2837d346880e679404b22..18bf872e5932c2d0e484c2a58de7200c866263f6 100644 (file)
   "privacy.unlisted.long": "公开,但不在公共时间轴显示",
   "privacy.unlisted.short": "公开",
   "reply_indicator.cancel": "取消",
-  "report.heading": "New report",
   "report.placeholder": "额外消息",
   "report.submit": "提交",
   "report.target": "Reporting",
index 69791293b88a63324df22ce8912ae8e039fbf79c..a461085c7f8a13ac0dc8400fef877530433a6740 100644 (file)
   "privacy.unlisted.long": "公開,但不在公共時間軸顯示",
   "privacy.unlisted.short": "公開",
   "reply_indicator.cancel": "取消",
-  "report.heading": "New report",
   "report.placeholder": "額外訊息",
   "report.submit": "提交",
   "report.target": "舉報",
index af55663a34e9735ee40b2f5eaf07b89717484520..d766fb3943c84ce1c55e418b7d625b962a6f46af 100644 (file)
   "privacy.unlisted.long": "不要貼到公開時間軸",
   "privacy.unlisted.short": "不列出來",
   "reply_indicator.cancel": "取消",
-  "report.heading": "New report",
   "report.placeholder": "更多訊息",
   "report.submit": "送出",
   "report.target": "通報中",