From 9df4d2ca5f3f708a7086b3131ae51d32646ece8d Mon Sep 17 00:00:00 2001
From: "kaie%kuix.de" <kaie%kuix.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 3 Oct 2007 17:20:40 +0000
Subject: [PATCH] Bug 387480, Support network-fetched cert import in Web Sites
 tab of Cert Mgr Follow up patch to rename "Internet Site(s)" to "Server(s)"
 in new dialog and cert manager r=rrelyea, blocking1.9=beltzner

git-svn-id: svn://10.0.0.236/trunk@237189 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../manager/locales/en-US/chrome/pippki/certManager.dtd       | 4 ++--
 .../security/manager/pki/resources/content/certManager.xul    | 2 +-
 .../manager/pki/resources/content/exceptionDialog.xul         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mozilla/security/manager/locales/en-US/chrome/pippki/certManager.dtd b/mozilla/security/manager/locales/en-US/chrome/pippki/certManager.dtd
index c21342db38c..f96d8217393 100644
--- a/mozilla/security/manager/locales/en-US/chrome/pippki/certManager.dtd
+++ b/mozilla/security/manager/locales/en-US/chrome/pippki/certManager.dtd
@@ -39,7 +39,7 @@
 
 <!ENTITY certmgr.tab.mine                     "Your Certificates">
 <!ENTITY certmgr.tab.others                   "Other People's">
-<!ENTITY certmgr.tab.websites2                "Internet Sites">
+<!ENTITY certmgr.tab.websites3                "Servers">
 <!ENTITY certmgr.tab.ca                       "Authorities">
 <!ENTITY certmgr.tab.orphan                   "Extra">
 
@@ -134,7 +134,7 @@
 <!ENTITY exceptionMgr.title                   "Add Security Exception">
 <!ENTITY exceptionMgr.exceptionButton         "Confirm Security Exception">
 <!ENTITY exceptionMgr.supplementalWarning     "Legitimate banks, stores, and other public sites will not ask you to do this.">
-<!ENTITY exceptionMgr.certlocation.caption    "Internet Site">
+<!ENTITY exceptionMgr.certlocation.caption2   "Server">
 <!ENTITY exceptionMgr.certlocation.url        "Location:">
 <!ENTITY exceptionMgr.certlocation.download   "Get Certificate">
 <!ENTITY exceptionMgr.certstatus.caption      "Certificate Status">
diff --git a/mozilla/security/manager/pki/resources/content/certManager.xul b/mozilla/security/manager/pki/resources/content/certManager.xul
index be8b5042628..fbe1cdd0150 100644
--- a/mozilla/security/manager/pki/resources/content/certManager.xul
+++ b/mozilla/security/manager/pki/resources/content/certManager.xul
@@ -65,7 +65,7 @@
       <tabs id="certMgrTabbox">
         <tab id="mine_tab" label="&certmgr.tab.mine;"/>
         <tab id="others_tab" label="&certmgr.tab.others;"/>
-        <tab id="websites_tab" label="&certmgr.tab.websites2;"/>
+        <tab id="websites_tab" label="&certmgr.tab.websites3;"/>
         <!-- FIXME Add selected="true" to ca_tab when 373525 gets fixed. -->
         <tab id="ca_tab" label="&certmgr.tab.ca;"/>
         <tab id="orphan_tab" label="&certmgr.tab.orphan;"/>
diff --git a/mozilla/security/manager/pki/resources/content/exceptionDialog.xul b/mozilla/security/manager/pki/resources/content/exceptionDialog.xul
index 63555bd1acf..e7b3fb9a543 100644
--- a/mozilla/security/manager/pki/resources/content/exceptionDialog.xul
+++ b/mozilla/security/manager/pki/resources/content/exceptionDialog.xul
@@ -73,7 +73,7 @@
   </hbox>
 
   <groupbox id="locationGroupBox">
-    <caption label="&exceptionMgr.certlocation.caption;"/>
+    <caption label="&exceptionMgr.certlocation.caption2;"/>
     <hbox align="center">
       <label control="locationTextBox" value="&exceptionMgr.certlocation.url;"/>
       <textbox id="locationTextBox" flex="1" oninput="handleTextChange();" value="https://"/>