From 05f67ed54b8e4c9468a1b95c83c39566715f3f3c Mon Sep 17 00:00:00 2001
From: "kaie@kuix.de" <kaie@kuix.de>
Date: Fri, 19 Oct 2007 12:13:23 -0700
Subject: [PATCH] relanding Bug 398549, Rename the "Extra" tab in Cert Manager
 r=rrelyea, a=sayrer

---
 .../manager/locales/en-US/chrome/pippki/certManager.dtd     | 6 +++---
 security/manager/pki/resources/content/WebSitesOverlay.xul  | 2 +-
 security/manager/pki/resources/content/certManager.xul      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/security/manager/locales/en-US/chrome/pippki/certManager.dtd b/security/manager/locales/en-US/chrome/pippki/certManager.dtd
index 366c92564fa..5af23acf72a 100644
--- a/security/manager/locales/en-US/chrome/pippki/certManager.dtd
+++ b/security/manager/locales/en-US/chrome/pippki/certManager.dtd
@@ -38,17 +38,17 @@
 <!ENTITY certmgr.title                       "Certificate Manager">
 
 <!ENTITY certmgr.tab.mine                     "Your Certificates">
-<!ENTITY certmgr.tab.others                   "Other People's">
+<!ENTITY certmgr.tab.others2                  "People">
 <!ENTITY certmgr.tab.websites3                "Servers">
 <!ENTITY certmgr.tab.ca                       "Authorities">
-<!ENTITY certmgr.tab.orphan                   "Extra">
+<!ENTITY certmgr.tab.orphan2                  "Others">
 
 <!ENTITY certmgr.ca.builtins                  "Built-in CAs">
 <!ENTITY certmgr.ca.mycas                     "CAs Managed By You">
 
 <!ENTITY certmgr.mine                         "You have certificates from these organizations that identify you:">
 <!ENTITY certmgr.others                       "You have certificates on file that identify these people:">
-<!ENTITY certmgr.websites                     "You have certificates on file that identify these web sites:">
+<!ENTITY certmgr.websites2                    "You have certificates on file that identify these servers:">
 <!ENTITY certmgr.cas                          "You have certificates on file that identify these certificate authorities:">
 <!ENTITY certmgr.orphans                      "You have certificates on file that do not fit in any of the other categories:">
 
diff --git a/security/manager/pki/resources/content/WebSitesOverlay.xul b/security/manager/pki/resources/content/WebSitesOverlay.xul
index cbe7e1b813a..92edf9f4ddf 100644
--- a/security/manager/pki/resources/content/WebSitesOverlay.xul
+++ b/security/manager/pki/resources/content/WebSitesOverlay.xul
@@ -48,7 +48,7 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <vbox id="webCerts">
-    <description>&certmgr.websites;</description>
+    <description>&certmgr.websites2;</description>
     <separator class="thin"/>
     <tree id="server-tree" flex="1" enableColumnDrag="true"
               onselect="websites_enableButtons()">
diff --git a/security/manager/pki/resources/content/certManager.xul b/security/manager/pki/resources/content/certManager.xul
index fbe1cdd0150..5cac62352c3 100644
--- a/security/manager/pki/resources/content/certManager.xul
+++ b/security/manager/pki/resources/content/certManager.xul
@@ -64,11 +64,11 @@
     <tabbox id="certmanagertabs" flex="1" style="margin:5px" persist="selectedIndex">
       <tabs id="certMgrTabbox">
         <tab id="mine_tab" label="&certmgr.tab.mine;"/>
-        <tab id="others_tab" label="&certmgr.tab.others;"/>
+        <tab id="others_tab" label="&certmgr.tab.others2;"/>
         <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;"/>
+        <tab id="orphan_tab" label="&certmgr.tab.orphan2;"/>
       </tabs>
       <tabpanels flex="1">
         <vbox id="myCerts" flex="1"/>