From 01895e7c307158072ebad158a52de3934ce6ad7f Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Thu, 2 Dec 2021 17:51:13 +0100
Subject: [PATCH] [components] Issue
 https://github.com/mozilla-mobile/android-components/issues/11306: Add
 minimal error page for HTTPS-Only mode.

X-Channel-Revision: [main] mozilla-mobile/android-components@cf522a7e00e5f3cd62c628ee6a4e5f57b1febad0
X-Channel-Revision: [main] mozilla-mobile/fenix@20b25d77dde61ea23acb4747c1a357ca9c863708
X-Channel-Revision: [main] mozilla-mobile/focus-android@29486b8522c84837c49b8a480892613e23cd2485
X-Channel-Converted-Revision: [ac-prep] mozilla-mobile/firefox-android@ed60f2e5df656f4aaf2d08c7f39f57583eb01466
---
 _meta/mozilla-mobile-firefox-android.json                  | 2 +-
 .../browser/errorpages/src/main/res/values/strings.xml     | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/_meta/mozilla-mobile-firefox-android.json b/_meta/mozilla-mobile-firefox-android.json
index 955af9bf421..182aba3fb36 100644
--- a/_meta/mozilla-mobile-firefox-android.json
+++ b/_meta/mozilla-mobile-firefox-android.json
@@ -1,6 +1,6 @@
 {
   "name": "mozilla-mobile/firefox-android",
   "revs": {
-    "ac-prep": "e86a6755070067bc8122e8df18ef4543aac7b0f2"
+    "ac-prep": "ed60f2e5df656f4aaf2d08c7f39f57583eb01466"
   }
 }
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
index 8ca4fde9e0a..4a183d8418e 100644
--- a/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/browser/errorpages/src/main/res/values/strings.xml
@@ -273,4 +273,11 @@
     <string name="mozac_browser_errorpages_safe_phishing_uri_message"><![CDATA[
       <p>This web page at %1$s has been reported as a deceptive site and has been blocked based on your security preferences.</p>
     ]]></string>
+
+    <!-- The title of the error page for websites that do not support HTTPS when HTTPS-Only is turned on -->
+    <string name="mozac_browser_errorpages_httpsonly_title">Secure Site Not Available</string>
+    <!-- The text of the error page for websites that do not support HTTPS when HTTPS-Only is turned on. %1$s will be replaced with the URL of the website. -->
+    <string name="mozac_browser_errorpages_httpsonly_message"><![CDATA[You’ve enabled HTTPS-Only Mode for enhanced security, and a HTTPS version of <em>%1$s</em> is not available.]]></string>
+    <!-- Button on error page for websites that do not support HTTPS when HTTPS-Only is turned on. Clicking the button allows the user to nevertheless load the website using HTTP. -->
+    <string name="mozac_browser_errorpages_httpsonly_button">Continue to HTTP Site</string>
 </resources>