From efc5b3a3bceed52a541142dfb3a4468db1e85a2d Mon Sep 17 00:00:00 2001
From: John Foerch <jjfoerch@earthlink.net>
Date: Fri, 4 Mar 2011 17:24:58 -0500
Subject: [PATCH] revert 84f0553a, fixing bug

all the needed entities should now be present for netError.xhtml to work
properly in xulrunner 2 and earlier version.
---
 chrome/chrome.manifest       | 2 ++
 locale/en-US/netErrorApp.dtd | 9 +++++++++
 locale/sv-SE/netErrorApp.dtd | 9 +++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 locale/en-US/netErrorApp.dtd
 create mode 100644 locale/sv-SE/netErrorApp.dtd

diff --git a/chrome/chrome.manifest b/chrome/chrome.manifest
index aed2998..74cb965 100644
--- a/chrome/chrome.manifest
+++ b/chrome/chrome.manifest
@@ -10,6 +10,8 @@ content  conkeror-test           file:../tests/
 
 locale   branding       en-US    file:../branding/
 
+override chrome://global/locale/netErrorApp.dtd chrome://conkeror-gui/locale/netErrorApp.dtd
+
 component {72a7eea7-a894-47ec-93a9-a7bc172cf1ac} ../components/application.js
 contract @conkeror.mozdev.org/application;1 {72a7eea7-a894-47ec-93a9-a7bc172cf1ac}
 
diff --git a/locale/en-US/netErrorApp.dtd b/locale/en-US/netErrorApp.dtd
new file mode 100644
index 0000000..5a72ead
--- /dev/null
+++ b/locale/en-US/netErrorApp.dtd
@@ -0,0 +1,9 @@
+<!ENTITY securityOverride.linkText "Or you can add an exception…">
+<!ENTITY securityOverride.warningText "
+<p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p>
+<p>If you still wish to add an exception for this site, use the <code>M-x&nbsp;ssl-add-exception</code> command.</p>
+">
+<!ENTITY securityOverride.warningContent "
+<p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p>
+<p>If you still wish to add an exception for this site, use the <code>M-x&nbsp;ssl-add-exception</code> command.</p>
+">
diff --git a/locale/sv-SE/netErrorApp.dtd b/locale/sv-SE/netErrorApp.dtd
new file mode 100644
index 0000000..69d767c
--- /dev/null
+++ b/locale/sv-SE/netErrorApp.dtd
@@ -0,0 +1,9 @@
+<!ENTITY securityOverride.linkText "Eller så kan du lägga till ett undantag…">
+<!ENTITY securityOverride.warningText "
+<p>Du bör inte lägga till ett undantag om du använder en anslutning som du inte litar på helt och hållet eller om du inte brukar se denna varning för denna server.</p>
+<p>Om du ända vill lägga till ett undantag, använd <code>M-x&nbsp;ssl-add-exception</code>.</p>
+">
+<!ENTITY securityOverride.warningContent "
+<p>Du bör inte lägga till ett undantag om du använder en anslutning som du inte litar på helt och hållet eller om du inte brukar se denna varning för denna server.</p>
+<p>Om du ända vill lägga till ett undantag, använd <code>M-x&nbsp;ssl-add-exception</code>.</p>
+">
-- 
2.11.4.GIT