From 1a0462b4587a127d90e36b1f50687a223be8ba0f Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Mon, 14 May 2018 14:32:47 -0400
Subject: [*AM] Make soft-blocked phrasing more generic so people will cry less
 when we do our job

---
 toolkit/locales/en-US/chrome/mozapps/extensions/blocklist.dtd       | 6 +++---
 .../locales/en-US/chrome/mozapps/extensions/extensions.properties   | 4 ++--
 toolkit/locales/en-US/chrome/mozapps/webextensions/blocklist.dtd    | 6 +++---
 .../en-US/chrome/mozapps/webextensions/extensions.properties        | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/blocklist.dtd b/toolkit/locales/en-US/chrome/mozapps/extensions/blocklist.dtd
index f393cc906..a9490db5e 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/blocklist.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/blocklist.dtd
@@ -4,10 +4,10 @@
 
 <!ENTITY blocklist.title             "Add-ons may be causing problems">
 <!ENTITY blocklist.style             "width: 45em; height: 30em">
-<!ENTITY blocklist.summary           "&brandShortName; has determined that the following add-ons are known to cause stability or security problems:">
-<!ENTITY blocklist.softblocked       "For your protection, it is highly recommended that you restart with these add-ons disabled.">
+<!ENTITY blocklist.summary           "&brandShortName; has determined that the following add-ons are known to cause issues:">
+<!ENTITY blocklist.softblocked       "It is highly recommended, but not required, that you restart with these add-ons disabled.">
 <!ENTITY blocklist.hardblocked       "These add-ons have a high risk of causing stability or security problems and have been blocked, but a restart is required to disable them completely.">
-<!ENTITY blocklist.softandhard       "The add-ons that have a high risk of causing stability or security problems have been blocked. The others are lower risk, but it is highly recommended that you restart with them disabled.">
+<!ENTITY blocklist.softandhard       "Some listed add-ons have a high risk of causing stability or security problems and have been blocked. For the others it is highly recommended, but not required, that you restart with them disabled.">
 <!ENTITY blocklist.moreinfo          "More information">
 
 <!ENTITY blocklist.accept.label      "Restart &brandShortName;">
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
index c4e2660ee..9d976e0e3 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
@@ -28,7 +28,7 @@ notification.jetsdk=This is a Jetpack/SDK extension which are not supported in %
 notification.blocked=%1$S has been disabled due to security or stability issues.
 notification.blocked.link=More Information
 #LOCALIZATION NOTE (notification.softblocked) %1$S is the add-on name
-notification.softblocked=%1$S is known to cause security or stability issues.
+notification.softblocked=%1$S is known to cause issues.
 notification.softblocked.link=More Information
 #LOCALIZATION NOTE (notification.outdated) %1$S is the add-on name
 notification.outdated=An important update is available for %1$S.
@@ -79,7 +79,7 @@ details.notification.incompatible=%1$S is incompatible with %2$S %3$S.
 details.notification.blocked=%1$S has been disabled due to security or stability issues.
 details.notification.blocked.link=More Information
 #LOCALIZATION NOTE (details.notification.softblocked) %1$S is the add-on name
-details.notification.softblocked=%1$S is known to cause security or stability issues.
+details.notification.softblocked=%1$S is known to cause issues.
 details.notification.softblocked.link=More Information
 #LOCALIZATION NOTE (details.notification.outdated) %1$S is the add-on name
 details.notification.outdated=An important update is available for %1$S.
diff --git a/toolkit/locales/en-US/chrome/mozapps/webextensions/blocklist.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/blocklist.dtd
index f393cc906..a9490db5e 100644
--- a/toolkit/locales/en-US/chrome/mozapps/webextensions/blocklist.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/blocklist.dtd
@@ -4,10 +4,10 @@
 
 <!ENTITY blocklist.title             "Add-ons may be causing problems">
 <!ENTITY blocklist.style             "width: 45em; height: 30em">
-<!ENTITY blocklist.summary           "&brandShortName; has determined that the following add-ons are known to cause stability or security problems:">
-<!ENTITY blocklist.softblocked       "For your protection, it is highly recommended that you restart with these add-ons disabled.">
+<!ENTITY blocklist.summary           "&brandShortName; has determined that the following add-ons are known to cause issues:">
+<!ENTITY blocklist.softblocked       "It is highly recommended, but not required, that you restart with these add-ons disabled.">
 <!ENTITY blocklist.hardblocked       "These add-ons have a high risk of causing stability or security problems and have been blocked, but a restart is required to disable them completely.">
-<!ENTITY blocklist.softandhard       "The add-ons that have a high risk of causing stability or security problems have been blocked. The others are lower risk, but it is highly recommended that you restart with them disabled.">
+<!ENTITY blocklist.softandhard       "Some listed add-ons have a high risk of causing stability or security problems and have been blocked. For the others it is highly recommended, but not required, that you restart with them disabled.">
 <!ENTITY blocklist.moreinfo          "More information">
 
 <!ENTITY blocklist.accept.label      "Restart &brandShortName;">
diff --git a/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.properties b/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.properties
index 10c0f81c3..b51c3e12d 100644
--- a/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.properties
@@ -31,7 +31,7 @@ notification.unsigned.link=More Information
 notification.blocked=%1$S has been disabled due to security or stability issues.
 notification.blocked.link=More Information
 #LOCALIZATION NOTE (notification.softblocked) %1$S is the add-on name
-notification.softblocked=%1$S is known to cause security or stability issues.
+notification.softblocked=%1$S is known to cause issues.
 notification.softblocked.link=More Information
 #LOCALIZATION NOTE (notification.outdated) %1$S is the add-on name
 notification.outdated=An important update is available for %1$S.
@@ -86,7 +86,7 @@ details.notification.unsigned.link=More Information
 details.notification.blocked=%1$S has been disabled due to security or stability issues.
 details.notification.blocked.link=More Information
 #LOCALIZATION NOTE (details.notification.softblocked) %1$S is the add-on name
-details.notification.softblocked=%1$S is known to cause security or stability issues.
+details.notification.softblocked=%1$S is known to cause issues.
 details.notification.softblocked.link=More Information
 #LOCALIZATION NOTE (details.notification.outdated) %1$S is the add-on name
 details.notification.outdated=An important update is available for %1$S.
-- 
cgit v1.2.3