Bug 536336 - Remove copyright strings in UI, r=gavin,handerson
authorPhil Ringnalda <philringnalda>
Tue, 29 Dec 2009 14:13:00 -0800
changeset 37486 90b4886e734a373ba56522b2ffabcb456faab9e4
parent 37485 13888569b909c4ba8322740f9f813e95bea2fe81
child 37487 b020c6b1588daeda71e3d3cfc30ff09dbc885bad
push idunknown
push userunknown
push dateunknown
reviewersgavin, handerson
bugs536336
milestone1.9.3a1pre
Bug 536336 - Remove copyright strings in UI, r=gavin,handerson
browser/app/application.ini
browser/app/macbuild/Contents/Info.plist.in
browser/base/content/aboutDialog.xul
browser/base/content/credits.xhtml
browser/branding/nightly/locales/en-US/brand.dtd
browser/branding/unofficial/locales/en-US/brand.dtd
browser/locales/en-US/chrome/browser/aboutDialog.dtd
other-licenses/branding/firefox/locales/en-US/brand.dtd
toolkit/content/about.xhtml
toolkit/locales/en-US/chrome/global/about.dtd
toolkit/locales/en-US/chrome/global/license.dtd
toolkit/locales/en-US/chrome/mozapps/help/welcome.xhtml
toolkit/locales/jar.mn
--- a/browser/app/application.ini
+++ b/browser/app/application.ini
@@ -42,17 +42,16 @@ Name=Firefox
 Version=@APP_VERSION@
 BuildID=@GRE_BUILDID@
 #ifdef MOZ_SOURCE_REPO
 SourceRepository=@MOZ_SOURCE_REPO@
 #endif
 #ifdef MOZ_SOURCE_STAMP
 SourceStamp=@MOZ_SOURCE_STAMP@
 #endif
-Copyright=Copyright (c) 1998 - 2010 mozilla.org
 ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 
 [Gecko]
 MinVersion=@GRE_MILESTONE@
 MaxVersion=@GRE_MILESTONE@
 
 [XRE]
 EnableProfileMigrator=1
--- a/browser/app/macbuild/Contents/Info.plist.in
+++ b/browser/app/macbuild/Contents/Info.plist.in
@@ -69,17 +69,17 @@
 			</array>
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
 	<string>firefox-bin</string>
 	<key>CFBundleGetInfoString</key>
-	<string>%APP_NAME% %APP_VERSION%, © 1998-2010 Contributors</string>
+	<string>%APP_NAME% %APP_VERSION%</string>
 	<key>CFBundleIconFile</key>
 	<string>firefox</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.mozilla.firefox</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>%APP_NAME%</string>
--- a/browser/base/content/aboutDialog.xul
+++ b/browser/base/content/aboutDialog.xul
@@ -80,20 +80,19 @@
   <script type="application/javascript" src="chrome://browser/content/aboutDialog.js"/>
 
   <deck id="modes" flex="1">
     <vbox flex="1" id="clientBox">
 #expand <label id="version" value="&aboutVersion; __MOZ_APP_VERSION__"/>
       <label id="distribution"/>
       <label id="distributionId"/>
       <description id="copyright">
-        &copyrightInfo1;<label 
+        <label
         class="text-link" href="&licenseLink;"
-        >&licenseLinkText;</label>&copyrightInfo2;
-        &logoCopyright;
+        >&licenseLinkText;</label>&licenseLinkSuffix;&logoTrademark;
       </description>
       <textbox id="userAgent" multiline="true" readonly="true" flex="1"/>
     </vbox>
     <vbox flex="1" id="creditsBox">
       <iframe id="creditsIframe" flex="1"/>
     </vbox>    
   </deck>
   <separator class="groove" id="groove"/>
--- a/browser/base/content/credits.xhtml
+++ b/browser/base/content/credits.xhtml
@@ -39,18 +39,16 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
                       "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"
   [
     <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
     %brandDTD;
     <!ENTITY % creditsDTD SYSTEM "chrome://browser/locale/credits.dtd">
     %creditsDTD;
-    <!ENTITY % licenseDTD SYSTEM "chrome://global/locale/license.dtd">
-    %licenseDTD;
     <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
     %globalDTD;
   ]
 >
 
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
@@ -616,23 +614,16 @@
             <li>Glaxstar</li>
             <li></li>
             <li>MozillaZine Community</li>
           </ul>
         </div>
 
         <p id="gecko" class="center" dir="&locale.dir;">&credit.poweredByGeckoReg;</p>
 
-        <p class="footnote" dir="&locale.dir;">
-          &brandFullName;&trade; &license.part0; &copy;1998-2010 &license.part1;
-          <a href="" link="about:credits" onclick="visitLink(event);">&license.contrib;</a>,
-          &license.part2;
-          <a href="" link="about:license" onclick="visitLink(event);">about:license</a>
-          &license.part3;</p>
-
         <p class="footnote">
           Mozilla Firefox&reg; and the Firefox logo are registered trademarks of the
           Mozilla Foundation. You are not granted rights or licenses to the trademarks
           of the Mozilla Foundation or any party, including without limitation the
           Firefox name or logo. Gecko&reg; is a registered trademark of Netscape
           Communications Corporation.</p>
 
         <p class="footnote">
--- a/browser/branding/nightly/locales/en-US/brand.dtd
+++ b/browser/branding/nightly/locales/en-US/brand.dtd
@@ -1,4 +1,4 @@
 <!ENTITY  brandShortName        "Minefield">
 <!ENTITY  brandFullName         "Minefield">            
 <!ENTITY  vendorShortName       "Mozilla">
-<!ENTITY  logoCopyright         " ">
+<!ENTITY  logoTrademark         " ">
--- a/browser/branding/unofficial/locales/en-US/brand.dtd
+++ b/browser/branding/unofficial/locales/en-US/brand.dtd
@@ -1,7 +1,7 @@
 <!ENTITY  brandShortName        "Namoroka">
 <!ENTITY  brandFullName         "Namoroka">
 <!ENTITY  vendorShortName       "mozilla.org">
-<!ENTITY  logoCopyright         " ">
+<!ENTITY  logoTrademark         " ">
 
 <!-- LOCALIZATION NOTE (releaseBaseURL): The about: page appends __MOZ_APP_VERSION__.html, e.g. 2.0.html -->
 <!ENTITY  releaseBaseURL        "http://www.mozilla.org/projects/namoroka/releases/">
--- a/browser/locales/en-US/chrome/browser/aboutDialog.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutDialog.dtd
@@ -2,12 +2,11 @@
 <!ENTITY copyright                  "Credits">
 <!ENTITY copyright.accesskey        "C">
 <!ENTITY copyrightGNOME.accesskey   "r">
 <!ENTITY aboutLink                  "&lt; About &brandFullName;">
 <!ENTITY aboutLink.accesskey        "A">
 <!ENTITY aboutVersion               "version">
 <!ENTITY closeCmdGNOME.label        "Close">  
 <!ENTITY closeCmdGNOME.accesskey    "C">
-<!ENTITY copyrightInfo1             "&#169;1998-2010 Contributors. All rights reserved. (">
 <!ENTITY licenseLink                "about:license">
 <!ENTITY licenseLinkText            "Licensing information">
-<!ENTITY copyrightInfo2             ").">
+<!ENTITY licenseLinkSuffix          ".">
--- a/other-licenses/branding/firefox/locales/en-US/brand.dtd
+++ b/other-licenses/branding/firefox/locales/en-US/brand.dtd
@@ -1,4 +1,5 @@
 <!ENTITY  brandShortName        "Firefox">
 <!ENTITY  brandFullName         "Mozilla Firefox">
 <!ENTITY  vendorShortName       "Mozilla">
-<!ENTITY  logoCopyright         "Firefox and the Firefox logos are trademarks of the Mozilla Foundation. All rights reserved.">
+<!-- LOCALIZATION NOTE (logoTrademark): note that there is no space between licenseLinkText (and its trailing licenseLinkSuffix entity) and this entity, so if your locale needs a space between sentences, you need to put it at the start of this entity. -->
+<!ENTITY  logoTrademark         " Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
--- a/toolkit/content/about.xhtml
+++ b/toolkit/content/about.xhtml
@@ -61,17 +61,17 @@
   <div id="aboutLogoContainer">
     <a id="vendorURL" href="http://www.mozilla.org/">
       <img src="about:logo" alt="&brandShortName;"/>
 #expand <p id="version">&about.version; __MOZ_APP_VERSION__</p>
     </a>
   </div>
 
   <ul id="aboutPageList">
-    <li>&about.copy.beforeLink; <a href="about:credits">&about.copy.linkTitle;</a> &about.copy.afterLink;</li>
+    <li>&about.credits.beforeLink;<a href="about:credits">&about.credits.linkTitle;</a>&about.credits.afterLink;</li>
     <li>&about.license.beforeLink; <a href="about:license">&about.license.linkTitle;</a> &about.license.afterLink;</li>
     <!-- Release notes link removed pending fix for bug 349985
     <li>&about.relnotes.beforeLink; <a id="releaseNotesURL" href="">&about.relnotes.linkTitle;</a> &about.relnotes.afterLink;</li>
     -->
     <li>&about.buildconfig.beforeLink; <a href="about:buildconfig">&about.buildconfig.linkTitle;</a> &about.buildconfig.afterLink;</li>
     <script type="application/javascript">
       // get release notes URL from prefs
       try {
--- a/toolkit/locales/en-US/chrome/global/about.dtd
+++ b/toolkit/locales/en-US/chrome/global/about.dtd
@@ -1,13 +1,15 @@
 <!ENTITY about.version                "version">
 
-<!ENTITY about.copy.beforeLink        "Copyright &copy; 1998-2010 by">
-<!ENTITY about.copy.linkTitle         "contributors">
-<!ENTITY about.copy.afterLink         "to the Mozilla Project.">
+<!-- LOCALIZATION NOTE (about.credits.beforeLink): note that there is no space between this phrase and the linked about.credits.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
+<!ENTITY about.credits.beforeLink     "See a list of ">
+<!ENTITY about.credits.linkTitle      "contributors">
+<!-- LOCALIZATION NOTE (about.credits.afterLink): note that there is no space between the linked about.credits.linkTitle phrase and this phrase, so if your locale needs a space between words, add it at the start of this entity. -->
+<!ENTITY about.credits.afterLink      " to the Mozilla Project.">
 
 <!ENTITY about.license.beforeLink     "Read the">
 <!ENTITY about.license.linkTitle      "licensing information">
 <!ENTITY about.license.afterLink      "for this product.">
 
 <!ENTITY about.relnotes.beforeLink    "Read the">
 <!ENTITY about.relnotes.linkTitle     "release notes">
 <!ENTITY about.relnotes.afterLink     "for this version.">
deleted file mode 100644
--- a/toolkit/locales/en-US/chrome/global/license.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-<!ENTITY license.part0     "is copyright">
-<!ENTITY license.part1     "by its">
-<!ENTITY license.contrib   "contributors">
-<!ENTITY license.part2     "according to terms set out in the">
-<!ENTITY license.part3     "document. All Rights Reserved.">
--- a/toolkit/locales/en-US/chrome/mozapps/help/welcome.xhtml
+++ b/toolkit/locales/en-US/chrome/mozapps/help/welcome.xhtml
@@ -54,12 +54,10 @@ Contributors:
   <li>Be sure that you are searching for something that relates to
     &brandShortName;; this is not a general Internet search.</li>
   <li>Try to broaden your search - don't be too specific; terms could be worded
     differently than your search.</li>
   <li>Avoid being too broad with your search.  For example, a common word like
     &quot;page&quot; will likely return more topics than you want.</li>
 </ul>
 
-<p>Copyright &copy; 2003-2010 Contributors to the Mozilla project.</p>
-
 </body>
 </html>
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -32,17 +32,16 @@
   locale/@AB_CD@/global/findbar.properties              (%chrome/global/findbar.properties)
 + locale/@AB_CD@/global/finddialog.dtd                  (%chrome/global/finddialog.dtd)
 + locale/@AB_CD@/global/finddialog.properties           (%chrome/global/finddialog.properties)
   locale/@AB_CD@/global/globalKeys.dtd                  (%chrome/global/globalKeys.dtd)
 + locale/@AB_CD@/global/intl.css                        (%chrome/global/intl.css)
 + locale/@AB_CD@/global/intl.properties                 (%chrome/global/intl.properties)
 + locale/@AB_CD@/global/keys.properties                 (%chrome/global/keys.properties)
 + locale/@AB_CD@/global/languageNames.properties        (%chrome/global/languageNames.properties)
-  locale/@AB_CD@/global/license.dtd                     (%chrome/global/license.dtd)
   locale/@AB_CD@/global/mozilla.dtd                     (%chrome/global/mozilla.dtd)
   locale/@AB_CD@/global/notification.dtd                (%chrome/global/notification.dtd)
   locale/@AB_CD@/global/preferences.dtd                 (%chrome/global/preferences.dtd)
 + locale/@AB_CD@/global/printdialog.dtd                 (%chrome/global/printdialog.dtd)
 + locale/@AB_CD@/global/printjoboptions.dtd             (%chrome/global/printjoboptions.dtd)
 + locale/@AB_CD@/global/printPageSetup.dtd              (%chrome/global/printPageSetup.dtd)
 + locale/@AB_CD@/global/printPreview.dtd                (%chrome/global/printPreview.dtd)
 + locale/@AB_CD@/global/printPreviewProgress.dtd        (%chrome/global/printPreviewProgress.dtd)