From a4fa9e23fc1ddb42452bb8f051a31894796c8002 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 26 May 2022 17:55:05 +0200 Subject: [PATCH] Change "dangerous" to "sensitive" in privacy policy and web UI (#18515) Fix #18470 --- app/javascript/mastodon/locales/defaultMessages.json | 4 ++-- app/javascript/mastodon/locales/en.json | 2 +- config/locales/en.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index 4725d2d7cc..aa1213faf3 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -1546,7 +1546,7 @@ "id": "compose_form.hashtag_warning" }, { - "defaultMessage": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.", + "defaultMessage": "Posts on Mastodon are not end-to-end encrypted. Do not share any sensitive information over Mastodon.", "id": "compose_form.encryption_warning" }, { @@ -3711,4 +3711,4 @@ ], "path": "app/javascript/mastodon/features/video/index.json" } -] \ No newline at end of file +] diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index d82f4cb0dd..4fc0849fbd 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -95,7 +95,7 @@ "compose.language.change": "Change language", "compose.language.search": "Search languages...", "compose_form.direct_message_warning_learn_more": "Learn more", - "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.", + "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any sensitive information over Mastodon.", "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.", "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.", "compose_form.lock_disclaimer.lock": "locked", diff --git a/config/locales/en.yml b/config/locales/en.yml index b90402cdd4..fc0ec6e3ea 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1533,7 +1533,7 @@ en: @@ -1604,7 +1604,7 @@ en:

If we decide to change our privacy policy, we will post those changes on this page.

-

This document is CC-BY-SA. It was last updated March 7, 2018.

+

This document is CC-BY-SA. It was last updated May 26, 2022.

Originally adapted from the Discourse privacy policy.

title: "%{instance} Terms of Service and Privacy Policy"