From b38aba4e14455da2eb586889db97de64e8986f54 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Wed, 15 Dec 2021 15:14:57 +0100
Subject: [PATCH] [focus] Closes
 https://github.com/mozilla-mobile/focus-android/issues/6009: Update strings
 for HTTPS-Only mode

X-Channel-Revision: [main] mozilla-mobile/android-components@96444ddbd36acf0987ca531574187647bc74b5f3
X-Channel-Revision: [main] mozilla-mobile/fenix@d039188782084c5475112e6d98ab829c7992e759
X-Channel-Revision: [main] mozilla-mobile/focus-android@a9a09b171665081b4e5f4d426f0e30f22f84ae49
X-Channel-Converted-Revision: [main] mozilla-mobile/firefox-android@c2993ea2500830be3b54e0872ed55b96bd745646
---
 _meta/mozilla-mobile-firefox-android-focus-android.json   | 2 +-
 .../focus-android/app/src/main/res/values/strings.xml     | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/_meta/mozilla-mobile-firefox-android-focus-android.json b/_meta/mozilla-mobile-firefox-android-focus-android.json
index f71f37db62c..95dc5ba5435 100644
--- a/_meta/mozilla-mobile-firefox-android-focus-android.json
+++ b/_meta/mozilla-mobile-firefox-android-focus-android.json
@@ -1,6 +1,6 @@
 {
   "name": "mozilla-mobile/firefox-android/focus-android",
   "revs": {
-    "main": "ae839829b76cfd89a6387b82bb16554a3286cb83"
+    "main": "c2993ea2500830be3b54e0872ed55b96bd745646"
   }
 }
\ No newline at end of file
diff --git a/mozilla-mobile/focus-android/app/src/main/res/values/strings.xml b/mozilla-mobile/focus-android/app/src/main/res/values/strings.xml
index 9ed3508aaeb..4b6dac3a534 100644
--- a/mozilla-mobile/focus-android/app/src/main/res/values/strings.xml
+++ b/mozilla-mobile/focus-android/app/src/main/res/values/strings.xml
@@ -769,8 +769,8 @@ The new line here must be kept as the second half of the string is clickable for
     <string name="preference_safe_browsing_summary">Block reported deceptive and attack sites, malware sites, and unwanted software sites.</string>
     <!-- Title of the preference to enable "HTTPS-Only" mode -->
     <string name="preference_https_only_title">HTTPS-Only Mode</string>
-    <!-- Description of the preference to enable "HTTPS-Only" mode. %1$s will get replaced with the name of the app. -->
-    <string name="preference_https_only_summary">HTTPS provides a secure, encrypted connection between %1$s and the websites you visit. Most websites support HTTPS, and if HTTPS-Only Mode is enabled, then %1$s will upgrade all connections to HTTPS.</string>
+    <!-- Description of the preference to enable "HTTPS-Only" mode. -->
+    <string name="preference_https_only_summary2">Automatically attempts to connect to sites using HTTPS for increased security. HTTPS connections provide a secure, encrypted connection to websites you visit.</string>
 
     <!-- Preference for exceptions tracking protection -->
     <string name="preference_exceptions">Exceptions</string>
@@ -849,6 +849,10 @@ The new line here must be kept as the second half of the string is clickable for
     <!-- Preference for using following device theme -->
     <string name="preference_follow_device_theme">Follow device theme</string>
 
+    <!-- The title of the error page for websites that do not support HTTPS when HTTPS-Only is turned on  -->
+    <string name="errorpage_httpsonly_title">The site you requested does not support HTTPS</string>
+    <!-- The text of the error page for websites that do not support HTTPS when HTTPS-Only is turned on. -->
+    <string name="errorpage_httpsonly_message">By default, %1$s attempts to connect using HTTPS for increased security. To change this setting or to learn more, go to Settings &gt; Privacy &amp; Security &gt; Security.</string>
 
     <!-- Sessions List -->
     <!-- Content description (not visible, for screen readers etc.): Button that closes a tab n the sessions list -->