From 780234047750fa4b2321411a0950fca70b4aee0b Mon Sep 17 00:00:00 2001 From: Anthony Lieuallen Date: Tue, 20 May 2008 01:50:40 +0000 Subject: [PATCH] * Incorporate netError.xhtml changes from 3.0b5 to 3.0RC1. * Fix application of contentaccessible flag. --- chrome.manifest | 11 ++--- content/netError.xhtml | 110 ++++++++++++++++++++++++++++++++++------- 2 files changed, 96 insertions(+), 25 deletions(-) diff --git a/chrome.manifest b/chrome.manifest index 9dafb51..13b38f9 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -1,12 +1,9 @@ -content resurrect content/ -skin resurrect classic/1.0 skin/ contentaccessible=yes - -overlay chrome://browser/content/browser.xul chrome://resurrect/content/resurrect-overlay.xul +content resurrect content/ contentaccessible=yes +skin resurrect classic/1.0 skin/ +overlay chrome://browser/content/browser.xul chrome://resurrect/content/resurrect-overlay.xul override chrome://global/content/netError.xhtml chrome://resurrect/content/netError.xhtml - -style chrome://global/content/customizeToolbar.xul chrome://resurrect/skin/resurrect-overlay.css -style chrome://global/content/netError.xhtml chrome://resurrect/skin/netError.css +style chrome://global/content/customizeToolbar.xul chrome://resurrect/skin/resurrect-overlay.css locale resurrect ca-AD locale/ca-AD/ locale resurrect da-DK locale/da-DK/ diff --git a/content/netError.xhtml b/content/netError.xhtml index cc216f5..07946af 100644 --- a/content/netError.xhtml +++ b/content/netError.xhtml @@ -46,7 +46,8 @@ - Henrik Skupin - Jeff Walden - Johnathan Nightingale - - Anthony Lieuallen + - Ehsan Akhgari + - Anthony Lieuallen - - Alternatively, the contents of this file may be used under the terms of - either the GNU General Public License Version 2 or later (the "GPL"), or @@ -62,14 +63,18 @@ - - ***** END LICENSE BLOCK ***** --> - &loadError.label; - + - + + + +

&generic.title;

@@ -221,6 +288,7 @@

&protocolNotFound.title;

&connectionFailure.title;

&netTimeout.title;

+

&redirectLoop.title;

&unknownSocketType.title;

&netReset.title;

@@ -230,6 +298,7 @@

&proxyResolveFailure.title;

&proxyConnectFailure.title;

&contentEncodingError.title;

+

&unsafeContentType.title;

&nssFailure2.title;

&nssBadCert.title;

@@ -239,6 +308,7 @@
&generic.longDesc;
&dnsNotFound.longDesc;
&fileNotFound.longDesc;
+
&malformedURI.longDesc;
&protocolNotFound.longDesc;
&connectionFailure.longDesc;
@@ -248,6 +318,7 @@
&netReset.longDesc;
&netOffline.longDesc;
&netInterrupt.longDesc;
+
&deniedPortAccess.longDesc;
&proxyResolveFailure.longDesc;
&proxyConnectFailure.longDesc;
@@ -257,6 +328,7 @@
&nssBadCert.longDesc2;
&malwareBlocked.longDesc;
+
@@ -268,6 +340,7 @@ +
@@ -280,6 +353,7 @@ +
&securityOverride.linkText;