From 5d9910acd1713f1aa4ef425f270b40276d8ba263 Mon Sep 17 00:00:00 2001
From: "matt%netscape.com"
 <matt%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 27 Jul 2006 14:54:42 +0000
Subject: [PATCH] bug 94404 moving sidebar into branding. sr=ben r=pchen

git-svn-id: svn://10.0.0.236/trunk@204663 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/suite/common/sidebar/customize.xul             |  7 ++++++-
 mozilla/suite/common/sidebar/sidebarOverlay.xul        |  8 +++++++-
 .../locales/en-US/chrome/common/sidebar/customize.dtd  |  4 ++--
 .../en-US/chrome/common/sidebar/sidebar.properties     |  7 +++----
 .../en-US/chrome/common/sidebar/sidebarOverlay.dtd     | 10 +++++-----
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/mozilla/suite/common/sidebar/customize.xul b/mozilla/suite/common/sidebar/customize.xul
index 582c4cccff2..6252616cbe1 100644
--- a/mozilla/suite/common/sidebar/customize.xul
+++ b/mozilla/suite/common/sidebar/customize.xul
@@ -24,7 +24,12 @@
   type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/sidebar/customize.dtd" >
+<!DOCTYPE window [
+<!ENTITY % customizeDTD SYSTEM "chrome://communicator/locale/sidebar/customize.dtd" >
+%customizeDTD;
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+]>
 
 <window
   xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/mozilla/suite/common/sidebar/sidebarOverlay.xul b/mozilla/suite/common/sidebar/sidebarOverlay.xul
index 5ef2a8cb4ab..975b7471789 100644
--- a/mozilla/suite/common/sidebar/sidebarOverlay.xul
+++ b/mozilla/suite/common/sidebar/sidebarOverlay.xul
@@ -21,7 +21,13 @@
  
 <?xml-stylesheet href="chrome://communicator/content/sidebar/sidebarOverlay.css" type="text/css"?> 
 <?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/sidebar/sidebarOverlay.dtd">
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % sidebarOverlayDTD SYSTEM "chrome://communicator/locale/sidebar/sidebarOverlay.dtd" >
+%sidebarOverlayDTD;
+]>
 
 <overlay id="sidebarOverlay"
   xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/mozilla/suite/locales/en-US/chrome/common/sidebar/customize.dtd b/mozilla/suite/locales/en-US/chrome/common/sidebar/customize.dtd
index 8e93522c6d5..f5fdc7ca58c 100644
--- a/mozilla/suite/locales/en-US/chrome/common/sidebar/customize.dtd
+++ b/mozilla/suite/locales/en-US/chrome/common/sidebar/customize.dtd
@@ -22,9 +22,9 @@
 <!-- extracted from ./customize.xul -->
 
 <!-- LOCALIZATION NOTE  sidebar.customize.title.label: Do NOT localize the term "Sidebar"  -->
-<!ENTITY sidebar.customize.title.label          "Customize Sidebar">
+<!ENTITY sidebar.customize.title.label          "Customize &sidebarName;">
 <!-- LOCALIZATION NOTE  sidebar.customize.current.label: Do NOT localize the term "Sidebar"  -->
-<!ENTITY sidebar.customize.current.label        "Tabs in Sidebar:">
+<!ENTITY sidebar.customize.current.label        "Tabs in &sidebarName;:">
 <!ENTITY sidebar.customize.reorder.label        "Reorder">
 <!ENTITY sidebar.customize.customize.label      "Customize Tab...">
 <!ENTITY sidebar.customize.remove.label         "Remove">
diff --git a/mozilla/suite/locales/en-US/chrome/common/sidebar/sidebar.properties b/mozilla/suite/locales/en-US/chrome/common/sidebar/sidebar.properties
index 988d6405f9c..6b195fda8d9 100644
--- a/mozilla/suite/locales/en-US/chrome/common/sidebar/sidebar.properties
+++ b/mozilla/suite/locales/en-US/chrome/common/sidebar/sidebar.properties
@@ -1,9 +1,8 @@
 addPanelConfirmTitle=Add Tab to Sidebar
-addPanelConfirmMessage=Add the tab '%title%' to the Sidebar?##Source: %url%
+addPanelConfirmMessage=Add the tab '%title%' to the %name%?##Source: %url%
 
 dupePanelAlertTitle=Sidebar
-dupePanelAlertMessage=%url% already exists in the Sidebar.
+dupePanelAlertMessage=%url% already exists in the %name%.
 
 addEngineConfirmTitle=Add Search Engine
-addEngineConfirmMessage=Add the following search engine to the Sidebar Internet Search tab?##Name: %title%#Search Category: %category%#Source: %url%
-
+addEngineConfirmMessage=Add the following search engine to the %name% Internet Search tab?##Name: %title%#Search Category: %category%#Source: %url%
\ No newline at end of file
diff --git a/mozilla/suite/locales/en-US/chrome/common/sidebar/sidebarOverlay.dtd b/mozilla/suite/locales/en-US/chrome/common/sidebar/sidebarOverlay.dtd
index ba65befb855..0d9df898646 100644
--- a/mozilla/suite/locales/en-US/chrome/common/sidebar/sidebarOverlay.dtd
+++ b/mozilla/suite/locales/en-US/chrome/common/sidebar/sidebarOverlay.dtd
@@ -20,23 +20,23 @@
    -                 Blake Ross <BlakeR1234@aol.com>
   --> 
 
-<!ENTITY sidebar.panels.label        "Sidebar">
+<!ENTITY sidebar.panels.label        "&sidebarName;">
 <!ENTITY sidebar.reload.label        "Reload">
 <!ENTITY sidebar.picker.label        "Tabs">
-<!ENTITY sidebar.customize.label     "Customize Sidebar...">
+<!ENTITY sidebar.customize.label     "Customize &sidebarName;...">
 <!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            "Sidebar">
+<!ENTITY sidebarCmd.label            "&sidebarName;">
 <!ENTITY sidebarCmd.accesskey        "b">
 <!ENTITY sidebar.loading.label       "Loading...">
 <!ENTITY sidebar.loading.stop.label  "Stop">
 
-<!ENTITY sidebar.no-panels.state     "The Sidebar is currently empty.">
+<!ENTITY sidebar.no-panels.state     "The &sidebarName; 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 Sidebar, click on the "View" menu above, and select "Sidebar."'>
+<!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.sbDirectory.label   "Sidebar Directory...">
 
 <!ENTITY sidebar.pagenotfound.label  "This tab is not available right now.">