Index: mozilla/browser/base/content/aboutDialog.xul
===================================================================
RCS file: /cvsroot/mozilla/browser/base/content/aboutDialog.xul,v
retrieving revision 1.29
diff -u -r1.29 mozilla/browser/base/content/aboutDialog.xul
--- mozilla/browser/base/content/aboutDialog.xul
+++ mozilla/browser/base/content/aboutDialog.xul
@@ -75,7 +75,7 @@
 #expand <label id="version" value="&aboutVersion; __MOZ_APP_VERSION__"/>
       <label id="distribution"/>
       <label id="distributionId"/>
-      <description id="copyright">&copyrightText;</description>
+      <description id="copyright">&copyrightText; &trademarkText; &externalTrademarkText;</description>
       <textbox id="userAgent" multiline="true" readonly="true"/>
     </vbox>
     <vbox flex="1" id="creditsBox">
Index: mozilla/browser/branding/unofficial/locales/en-US/brand.dtd
===================================================================
RCS file: /cvsroot/mozilla/browser/branding/unofficial/locales/en-US/brand.dtd,v
retrieving revision 1.1
diff -u -r1.1 mozilla/browser/branding/unofficial/locales/en-US/brand.dtd
--- mozilla/browser/branding/unofficial/locales/en-US/brand.dtd
+++ mozilla/browser/branding/unofficial/locales/en-US/brand.dtd
@@ -1,6 +1,7 @@
 <!ENTITY  brandShortName        "Gran Paradiso">
 <!ENTITY  brandFullName         "Gran Paradiso">            
 <!ENTITY  vendorShortName       "mozilla.org">
+<!ENTITY  trademarkText         "">
 
 <!-- LOCALIZATION NOTE (releaseBaseURL): The about: page appends __MOZ_APP_VERSION__.html, e.g. 2.0.html -->
 <!ENTITY  releaseBaseURL        "http://www.mozilla.org/projects/granparadiso/releases/">
Index: mozilla/browser/locales/en-US/chrome/branding/brand.dtd
===================================================================
RCS file: /cvsroot/mozilla/browser/locales/en-US/chrome/branding/brand.dtd,v
retrieving revision 1.6
diff -u -r1.6 mozilla/browser/locales/en-US/chrome/branding/brand.dtd
--- mozilla/browser/locales/en-US/chrome/branding/brand.dtd
+++ mozilla/browser/locales/en-US/chrome/branding/brand.dtd
@@ -1,3 +1,4 @@
 <!ENTITY  brandShortName        "Minefield">
 <!ENTITY  brandFullName         "Minefield">            
 <!ENTITY  vendorShortName       "Mozilla">
+<!ENTITY  trademarkText         "">
Index: mozilla/browser/locales/en-US/chrome/browser/aboutDialog.dtd
===================================================================
RCS file: /cvsroot/mozilla/browser/locales/en-US/chrome/browser/aboutDialog.dtd,v
retrieving revision 1.9
diff -u -r1.9 mozilla/browser/locales/en-US/chrome/browser/aboutDialog.dtd
--- mozilla/browser/locales/en-US/chrome/browser/aboutDialog.dtd
+++ mozilla/browser/locales/en-US/chrome/browser/aboutDialog.dtd
@@ -4,7 +4,5 @@
 <!ENTITY aboutLink              "&lt; About &brandFullName;">
 <!ENTITY aboutLink.accesskey    "A">
 <!ENTITY aboutVersion           "version">
-<!ENTITY copyrightText          "&#169;1998-2007 Contributors. All Rights Reserved. Firefox and the 
-                                 Firefox logos are trademarks of the Mozilla Foundation.  All rights 
-                                 reserved. Some trademark rights used under license from The 
-                                 Charlton Company.">
+<!ENTITY copyrightText          "&#169;1998-2007 Contributors.">
+<!ENTITY externalTrademarkText  "">
Index: mozilla/calendar/locales/en-US/chrome/branding/brand.dtd
===================================================================
RCS file: /cvsroot/mozilla/calendar/locales/en-US/chrome/branding/brand.dtd,v
retrieving revision 1.4
diff -u -r1.4 mozilla/calendar/locales/en-US/chrome/branding/brand.dtd
--- mozilla/calendar/locales/en-US/chrome/branding/brand.dtd
+++ mozilla/calendar/locales/en-US/chrome/branding/brand.dtd
@@ -1,3 +1,6 @@
 <!ENTITY  brandShortName        "Calendar">
 <!ENTITY  brandFullName         "Calendar">
 <!ENTITY  vendorShortName       "Mozilla">
+<!ENTITY  trademarkText         "Mozilla Sunbird, Sunbird, and the
+                                 Sunbird logos are trademarks of the Mozilla
+                                 Foundation.">
Index: mozilla/calendar/locales/en-US/chrome/calendar/aboutDialog.dtd
===================================================================
RCS file: /cvsroot/mozilla/calendar/locales/en-US/chrome/calendar/aboutDialog.dtd,v
retrieving revision 1.6
diff -u -r1.6 mozilla/calendar/locales/en-US/chrome/calendar/aboutDialog.dtd
--- mozilla/calendar/locales/en-US/chrome/calendar/aboutDialog.dtd
+++ mozilla/calendar/locales/en-US/chrome/calendar/aboutDialog.dtd
@@ -42,10 +42,8 @@
 <!ENTITY aboutLink.label        "&lt; About &brandFullName;">
 <!ENTITY aboutLink.accesskey    "A">
 <!ENTITY aboutVersion           "version">
-<!ENTITY copyrightText          "&#169;1998-2007 Contributors. All rights
-                                 reserved. Mozilla Sunbird, Sunbird, and the
-                                 Sunbird logos are trademarks of the Mozilla
-                                 Foundation. All rights reserved.">
+<!ENTITY copyrightText          "&#169;1998-2007 Contributors.">
+<!ENTITY externalTrademarkText  "">
 
 <!ENTITY brandMotto       "it's about time">
 <!ENTITY credit.leads     "Engineering Leads">
Index: mozilla/calendar/sunbird/base/content/aboutDialog.xul
===================================================================
RCS file: /cvsroot/mozilla/calendar/sunbird/base/content/aboutDialog.xul,v
retrieving revision 1.7
diff -u -r1.7 mozilla/calendar/sunbird/base/content/aboutDialog.xul
--- mozilla/calendar/sunbird/base/content/aboutDialog.xul
+++ mozilla/calendar/sunbird/base/content/aboutDialog.xul
@@ -71,7 +71,7 @@
   <deck id="modes" flex="1">
     <vbox flex="1" id="clientBox">
 #expand <label id="version" value="&aboutVersion; __APP_VERSION__"/>
-      <description id="copyright">&copyrightText;</description>
+      <description id="copyright">&copyrightText; &trademarkText; &externalTrademarkText;</description>
       <vbox id="detailsBox" align="center" flex="1">
         <spacer flex="1"/>
         <textbox flex="1" id="userAgent" multiline="true" readonly="true" cols="60"/>
Index: mozilla/composer/base/content/composer/aboutDialog.xul
===================================================================
RCS file: /cvsroot/mozilla/composer/base/content/composer/aboutDialog.xul,v
retrieving revision 1.3
diff -u -r1.3 mozilla/composer/base/content/composer/aboutDialog.xul
--- mozilla/composer/base/content/composer/aboutDialog.xul
+++ mozilla/composer/base/content/composer/aboutDialog.xul
@@ -74,7 +74,7 @@
 
       <label id="version" value="&aboutVersion; @COMPOSER_VERSION@"/>
 
-      <description id="copyright">&copyrightText;</description>
+      <description id="copyright">&copyrightText; &trademarkText; &externalTrademarkText;</description>
       <vbox id="detailsBox" align="center" flex="1">
         <spacer flex="1"/>
         <description id="userAgent"/>
Index: mozilla/composer/base/locale/en-US/branding/brand.dtd
===================================================================
RCS file: /cvsroot/mozilla/composer/base/locale/en-US/branding/brand.dtd,v
retrieving revision 1.2
diff -u -r1.2 mozilla/composer/base/locale/en-US/branding/brand.dtd
--- mozilla/composer/base/locale/en-US/branding/brand.dtd
+++ mozilla/composer/base/locale/en-US/branding/brand.dtd
@@ -40,3 +40,4 @@
 <!ENTITY  brandFullName         "Composer">
 <!ENTITY  vendorShortName       "Disruptive Innovations">
 <!ENTITY  sidebarName           "Sidebar">
+<!ENTITY  trademarkText         "">
Index: mozilla/composer/base/locale/en-US/composer/aboutDialog.dtd
===================================================================
RCS file: /cvsroot/mozilla/composer/base/locale/en-US/composer/aboutDialog.dtd,v
retrieving revision 1.2
diff -u -r1.2 mozilla/composer/base/locale/en-US/composer/aboutDialog.dtd
--- mozilla/composer/base/locale/en-US/composer/aboutDialog.dtd
+++ mozilla/composer/base/locale/en-US/composer/aboutDialog.dtd
@@ -2,5 +2,6 @@
 <!ENTITY copyright              "Credits">
 <!ENTITY aboutLink              "&lt; About &brandFullName;">
 <!ENTITY aboutVersion           "version">
-<!ENTITY copyrightText          "&#169;1998-2006 Contributors. All Rights Reserved.">
+<!ENTITY copyrightText          "&#169;1998-2006 Contributors.">
+<!ENTITY externalTrademarkText  "">
 <!ENTITY cmdClose.macKey        "W">
Index: mozilla/mail/base/content/aboutDialog.xul
===================================================================
RCS file: /cvsroot/mozilla/mail/base/content/aboutDialog.xul,v
retrieving revision 1.22
diff -u -r1.22 mozilla/mail/base/content/aboutDialog.xul
--- mozilla/mail/base/content/aboutDialog.xul
+++ mozilla/mail/base/content/aboutDialog.xul
@@ -115,7 +115,7 @@
         <textbox id="versionField" readonly="true" class="plain" tabindex="2"
 #expand value="&aboutVersion; __MOZ_APP_VERSION__"/>
             </vbox>
-      <description id="copyright">&copyrightText;</description>
+      <description id="copyright">&copyrightText; &trademarkText; &externalTrademarkText;</description>
       <separator/>
       </vbox>
 
Index: mozilla/mail/locales/en-US/chrome/branding/brand.dtd
===================================================================
RCS file: /cvsroot/mozilla/mail/locales/en-US/chrome/branding/brand.dtd,v
retrieving revision 1.3
diff -u -r1.3 mozilla/mail/locales/en-US/chrome/branding/brand.dtd
--- mozilla/mail/locales/en-US/chrome/branding/brand.dtd
+++ mozilla/mail/locales/en-US/chrome/branding/brand.dtd
@@ -1,3 +1,4 @@
 <!ENTITY  brandShortName        "Mail/News">
 <!ENTITY  brandFullName         "Mail/News Client">
 <!ENTITY  vendorShortName       "Mozilla">
+<!ENTITY  trademarkText         "">
Index: mozilla/minimo/chrome/locale/en-US/brand.dtd
===================================================================
RCS file: /cvsroot/mozilla/minimo/chrome/locale/en-US/brand.dtd,v
retrieving revision 1.3
diff -u -r1.3 mozilla/minimo/chrome/locale/en-US/brand.dtd
--- mozilla/minimo/chrome/locale/en-US/brand.dtd
+++ mozilla/minimo/chrome/locale/en-US/brand.dtd
@@ -1,6 +1,7 @@
 <!ENTITY  brandShortName        "Minimo">
 <!ENTITY  brandFullName         "Minimo">            
 <!ENTITY  vendorShortName       "Minimo">
+<!ENTITY  trademarkText         "">
  
 <!ENTITY  releaseURL            "http://www.mozilla.org/projects/minimo">
 
Index: mozilla/other-licenses/branding/firefox/locales/en-US/brand.dtd
===================================================================
RCS file: /cvsroot/mozilla/other-licenses/branding/firefox/locales/en-US/brand.dtd,v
retrieving revision 1.6
diff -u -r1.6 mozilla/other-licenses/branding/firefox/locales/en-US/brand.dtd
--- mozilla/other-licenses/branding/firefox/locales/en-US/brand.dtd
+++ mozilla/other-licenses/branding/firefox/locales/en-US/brand.dtd
@@ -1,3 +1,7 @@
 <!ENTITY  brandShortName        "Firefox">
 <!ENTITY  brandFullName         "Mozilla Firefox">
 <!ENTITY  vendorShortName       "Mozilla">
+<!ENTITY  trademarkText         "Firefox and the Firefox logos are trademarks
+                                 of the Mozilla Foundation.
+                                 Some trademark rights used under license from
+                                 The Charlton Company.">
Index: mozilla/other-licenses/branding/sunbird/locales/en-US/brand.dtd
===================================================================
RCS file: /cvsroot/mozilla/other-licenses/branding/sunbird/locales/en-US/brand.dtd,v
retrieving revision 1.2
diff -u -r1.2 mozilla/other-licenses/branding/sunbird/locales/en-US/brand.dtd
--- mozilla/other-licenses/branding/sunbird/locales/en-US/brand.dtd
+++ mozilla/other-licenses/branding/sunbird/locales/en-US/brand.dtd
@@ -1,3 +1,4 @@
 <!ENTITY  brandShortName        "Sunbird">
 <!ENTITY  brandFullName         "Mozilla Sunbird">
 <!ENTITY  vendorShortName       "Mozilla">
+<!ENTITY  trademarkText         "">
Index: mozilla/other-licenses/branding/thunderbird/locales/en-US/brand.dtd
===================================================================
RCS file: /cvsroot/mozilla/other-licenses/branding/thunderbird/locales/en-US/brand.dtd,v
retrieving revision 1.5
diff -u -r1.5 mozilla/other-licenses/branding/thunderbird/locales/en-US/brand.dtd
--- mozilla/other-licenses/branding/thunderbird/locales/en-US/brand.dtd
+++ mozilla/other-licenses/branding/thunderbird/locales/en-US/brand.dtd
@@ -1,3 +1,4 @@
 <!ENTITY  brandShortName        "Thunderbird">
 <!ENTITY  brandFullName         "Mozilla Thunderbird">
 <!ENTITY  vendorShortName       "Mozilla">
+<!ENTITY  trademarkText         "">
Index: mozilla/suite/locales/en-US/chrome/branding/brand.dtd
===================================================================
RCS file: /cvsroot/mozilla/suite/locales/en-US/chrome/branding/brand.dtd,v
retrieving revision 1.9
diff -u -r1.9 mozilla/suite/locales/en-US/chrome/branding/brand.dtd
--- mozilla/suite/locales/en-US/chrome/branding/brand.dtd
+++ mozilla/suite/locales/en-US/chrome/branding/brand.dtd
@@ -2,5 +2,7 @@
 <!ENTITY  brandFullName         "SeaMonkey">
 <!ENTITY  brandShortName        "SeaMonkey">
 <!ENTITY  vendorShortName       "SeaMonkey">
+<!ENTITY  trademarkText         "">
+
 <!ENTITY  sidebarName           "Sidebar">
 <!ENTITY  copyright.string      "Copyright &copy; 2003-2007 Contributors to the Mozilla project.">