Bug 1599559 - Port bug 1584998: Add missing xfoBlocked.* strings to netError.dtd. r=Paenglab
authoraceman <acelists@atlas.sk>
Wed, 27 Nov 2019 10:03:31 +1300
changeset 12464 ca0fa4975b257bd1797a315154e43df9004aeb87
parent 12463 b188cef77ebe1dbc25ec9e3067c8f05f85d39647
child 12465 14325e215bd55b3475966f5fb52c48c02e6c01f3
push id201
push userflodolo@mozilla.com
push dateWed, 27 Nov 2019 09:22:01 +0000
reviewersPaenglab
bugs1599559, 1584998
Bug 1599559 - Port bug 1584998: Add missing xfoBlocked.* strings to netError.dtd. r=Paenglab X-Channel-Repo: comm-central X-Channel-Converted-Revision: bdbe5d2feea18ceae214dfcff88c890b93f15183 X-Channel-Repo: releases/comm-beta X-Channel-Revision: 67169a45614459f525f9e2ed1e97583f6a639ba7 X-Channel-Repo: releases/comm-release X-Channel-Revision: 9bb7406580cddeb1bfde288ce6921dd7019f6315 X-Channel-Repo: releases/comm-esr68 X-Channel-Revision: d05d4d87d25c5d290afeb0353f218dbb7b735bf2
mail/chrome/overrides/netError.dtd
--- a/mail/chrome/overrides/netError.dtd
+++ b/mail/chrome/overrides/netError.dtd
@@ -162,16 +162,19 @@ be temporary, and you can try again late
   <li>If your computer or network is protected by a firewall or proxy, make sure
     that &brandShortName; is permitted to access the Web.</li>
 </ul>
 ">
 
 <!ENTITY cspBlocked.title "Blocked by Content Security Policy">
 <!ENTITY cspBlocked.longDesc "<p>&brandShortName; prevented this page from loading in this way because the page has a content security policy that disallows it.</p>">
 
+<!ENTITY xfoBlocked.title "Blocked by X-Frame-Options Policy">
+<!ENTITY xfoBlocked.longDesc "<p>&brandShortName; prevented this page from loading in this context because the page has an X-Frame-Options policy that disallows it.</p>">
+
 <!ENTITY corruptedContentErrorv2.title "Corrupted Content Error">
 <!ENTITY corruptedContentErrorv2.longDesc "<p>The page you are trying to view cannot be shown because an error in the data transmission was detected.</p><ul><li>Please contact the website owners to inform them of this problem.</li></ul>">
 
 <!ENTITY securityOverride.linkText "Or you can add an exception…">
 <!ENTITY securityOverride.getMeOutOfHereButton "Get me out of here!">
 <!ENTITY securityOverride.exceptionButtonLabel "Add Exception…">
 
 <!-- LOCALIZATION NOTE (securityOverride.warningContent) - Do not translate the