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 36731 bdbe5d2feea18ceae214dfcff88c890b93f15183
parent 36730 383c10de7c73133a634996a8a2963193749c2311
child 36732 06fd730429c0a1ad4992f5377fbf56f7b8ac1643
push id2534
push userclokep@gmail.com
push dateMon, 02 Dec 2019 19:52:51 +0000
treeherdercomm-beta@055c50840778 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersPaenglab
bugs1599559, 1584998
Bug 1599559 - Port bug 1584998: Add missing xfoBlocked.* strings to netError.dtd. r=Paenglab
mail/locales/en-US/chrome/overrides/netError.dtd
--- a/mail/locales/en-US/chrome/overrides/netError.dtd
+++ b/mail/locales/en-US/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