From b23a989fa05387d1132b9fd719f82033943a5adb Mon Sep 17 00:00:00 2001
From: "sgehani%netscape.com" <sgehani%netscape.com>
Date: Thu, 27 Jul 2006 14:55:13 +0000
Subject: [PATCH] Remove dependency of sidebarOverlay on brand.dtd. b=109450;
 r=morse; sr=blake

---
 suite/common/sidebar/sidebarOverlay.xul               |  2 --
 .../en-US/chrome/common/sidebar/sidebarOverlay.dtd    | 11 ++++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/suite/common/sidebar/sidebarOverlay.xul b/suite/common/sidebar/sidebarOverlay.xul
index 77c3d7731c8..a1e49bfd8e4 100644
--- a/suite/common/sidebar/sidebarOverlay.xul
+++ b/suite/common/sidebar/sidebarOverlay.xul
@@ -23,8 +23,6 @@
 <?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
 
 <!DOCTYPE window [
-<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
-%brandDTD;
 <!ENTITY % sidebarOverlayDTD SYSTEM "chrome://communicator/locale/sidebar/sidebarOverlay.dtd" >
 %sidebarOverlayDTD;
 ]>
diff --git a/suite/locales/en-US/chrome/common/sidebar/sidebarOverlay.dtd b/suite/locales/en-US/chrome/common/sidebar/sidebarOverlay.dtd
index 0d9df898646..4433a268b31 100644
--- a/suite/locales/en-US/chrome/common/sidebar/sidebarOverlay.dtd
+++ b/suite/locales/en-US/chrome/common/sidebar/sidebarOverlay.dtd
@@ -18,25 +18,26 @@
    - 
    - Contributor(s): Stephen Lamm <slamm@netscape.com>
    -                 Blake Ross <BlakeR1234@aol.com>
+   -                 Samir Gehani <sgehani@netscape.com>
   --> 
 
-<!ENTITY sidebar.panels.label        "&sidebarName;">
+<!ENTITY sidebar.panels.label        "Sidebar">
 <!ENTITY sidebar.reload.label        "Reload">
 <!ENTITY sidebar.picker.label        "Tabs">
-<!ENTITY sidebar.customize.label     "Customize &sidebarName;...">
+<!ENTITY sidebar.customize.label     "Customize Sidebar...">
 <!ENTITY sidebar.customize.accesskey "u">
 <!ENTITY sidebar.hide.label          "Hide Panel">
 <!ENTITY sidebar.hide.accesskey      "H">
 <!ENTITY sidebar.switch.label        "Switch to Panel">
 <!ENTITY sidebar.switch.accesskey    "S">
-<!ENTITY sidebarCmd.label            "&sidebarName;">
+<!ENTITY sidebarCmd.label            "Sidebar">
 <!ENTITY sidebarCmd.accesskey        "b">
 <!ENTITY sidebar.loading.label       "Loading...">
 <!ENTITY sidebar.loading.stop.label  "Stop">
 
-<!ENTITY sidebar.no-panels.state     "The &sidebarName; is currently empty.">
+<!ENTITY sidebar.no-panels.state     "The sidebar is currently empty.">
 <!ENTITY sidebar.no-panels.add       'You may add tabs by clicking on the "Tabs" button above.'>
-<!ENTITY sidebar.no-panels.hide      'If you would like to completely hide the &sidebarName;, click on the "View" menu above, and select "&sidebarName;."'>
+<!ENTITY sidebar.no-panels.hide      'If you would like to completely hide the Sidebar, click on the "View" menu above, and select "Sidebar."'>
 <!ENTITY sidebar.sbDirectory.label   "Sidebar Directory...">
 
 <!ENTITY sidebar.pagenotfound.label  "This tab is not available right now.">