Skip to content

Commit

Permalink
revert 84f0553, fixing bug
Browse files Browse the repository at this point in the history
all the needed entities should now be present for netError.xhtml to work
properly in xulrunner 2 and earlier version.
  • Loading branch information
John Foerch committed Mar 4, 2011
1 parent 84f0553 commit efc5b3a
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 0 deletions.
2 changes: 2 additions & 0 deletions chrome/chrome.manifest
Expand Up @@ -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}

Expand Down
9 changes: 9 additions & 0 deletions 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>
">
9 changes: 9 additions & 0 deletions 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>
">

0 comments on commit efc5b3a

Please sign in to comment.