--- desktopNetError.xhtml 2011-07-15 16:43:49.425642815 -0700 +++ mobileNetError.xhtml 2011-07-15 16:44:05.065642799 -0700 @@ -21,31 +21,25 @@ - the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" basis, - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - for the specific language governing rights and limitations under the - License. - - - The Original Code is mozilla.org code. + - The Original Code is netError.xhtml. - - The Initial Developer of the Original Code is - Netscape Communications Corporation. - Portions created by the Initial Developer are Copyright (C) 1998 - the Initial Developer. All Rights Reserved. - - Contributor(s): - - Adam Lock - - William R. Price - - Henrik Skupin - - Jeff Walden - - Johnathan Nightingale - - Ehsan Akhgari - - Steffen Wilberg + - Wesley Johnston - - 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 - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - in which case the provisions of the GPL or the LGPL are applicable instead - of those above. If you wish to allow use of your version of this file only - under the terms of either the GPL or the LGPL, and not to allow others to - use your version of this file under the terms of the MPL, indicate your @@ -53,16 +47,17 @@ - and other provisions required by the LGPL or the GPL. If you do not delete - the provisions above, a recipient may use your version of this file under - the terms of any one of the MPL, the GPL or the LGPL. - - ***** END LICENSE BLOCK ***** --> + &loadError.label; - +

&generic.title;

&dnsNotFound.title;

&fileNotFound.title;

&malformedURI.title;

@@ -327,56 +322,54 @@

&netInterrupt.title;

&deniedPortAccess.title;

&proxyResolveFailure.title;

&proxyConnectFailure.title;

&contentEncodingError.title;

&unsafeContentType.title;

&nssFailure2.title;

&nssBadCert.title;

-

&malwareBlocked.title;

&cspFrameAncestorBlocked.title;

&remoteXUL.title;

&corruptedContentError.title;

&generic.longDesc;
-
&dnsNotFound.longDesc;
+
&dnsNotFound.longDesc2;
&fileNotFound.longDesc;
&malformedURI.longDesc;
&protocolNotFound.longDesc;
&connectionFailure.longDesc;
&netTimeout.longDesc;
&redirectLoop.longDesc;
&unknownSocketType.longDesc;
&netReset.longDesc;
&netOffline.longDesc2;
&netInterrupt.longDesc;
&deniedPortAccess.longDesc;
-
&proxyResolveFailure.longDesc;
+
&proxyResolveFailure.longDesc2;
&proxyConnectFailure.longDesc;
&contentEncodingError.longDesc;
&unsafeContentType.longDesc;
&nssFailure2.longDesc;
&nssBadCert.longDesc2;
-
&malwareBlocked.longDesc;
&cspFrameAncestorBlocked.longDesc;
&remoteXUL.longDesc;
&corruptedContentError.longDesc;
+ +
+

+

+
- - -
-

-

- +