Bug 541761 - change text which implies Firefox logo is under non-free copyright licence. r=kairo.
authorGervase Markham <gerv@gerv.net>
Wed, 28 Apr 2010 10:45:51 +0100
changeset 41462 57d57ecce06b4e11e654fbfd6ae91e940915f723
parent 41461 740aeef3e1982c79e5bd78dc82045d93e3c3d926
child 41463 186ffdad4f256bff05e403617342eaf3c0fbdcd2
push idunknown
push userunknown
push dateunknown
reviewerskairo
bugs541761
milestone1.9.3a5pre
Bug 541761 - change text which implies Firefox logo is under non-free copyright licence. r=kairo.
toolkit/content/aboutRights.xhtml
toolkit/locales/en-US/chrome/global/aboutRights.dtd
--- a/toolkit/content/aboutRights.xhtml
+++ b/toolkit/content/aboutRights.xhtml
@@ -59,17 +59,17 @@
 
 <p>&rights.intro;</p>
 
 <ul>
   <li>&rights.intro-point1a;<a href="http://www.mozilla.org/MPL/">&rights.intro-point1b;</a>&rights.intro-point1c;</li>
 # Point 2 discusses Mozilla trademarks, and isn't needed when the build is unbranded.
 # Point 3 discusses privacy policy, unbranded builds get a placeholder (for the vendor to replace)
 # Point 4 discusses web service terms, unbranded builds gets a placeholder (for the vendor to replace)
-  <li>&rights.intro-point2a;<a href="http://www.mozilla.org/foundation/trademarks/policy.html">&rights.intro-point2b;</a>&rights.intro-point2c;</li>
+  <li>&rights.intro-point2-a;<a href="http://www.mozilla.org/foundation/trademarks/policy.html">&rights.intro-point2-b;</a>&rights.intro-point2-c;</li>
   <li>&rights.intro-point3a;<a href="http://www.mozilla.com/legal/privacy/">&rights.intro-point3b;</a>&rights.intro-point3c;</li>
   <li>&rights.intro-point4a;<a href="about:rights#webservices" onclick="showServices();">&rights.intro-point4b;</a>&rights.intro-point4c;</li>
 </ul>
 
 <div id="webservices-container">
   <a name="webservices"/>
   <h3>&rights.webservices-header;</h3>
 
--- a/toolkit/locales/en-US/chrome/global/aboutRights.dtd
+++ b/toolkit/locales/en-US/chrome/global/aboutRights.dtd
@@ -11,19 +11,19 @@
      chunk, it can be left blank.
 
      Also note the leading/trailing whitespace in strings here, which is
      deliberate for formatting around the embedded links. -->
 <!ENTITY rights.intro-point1a "&brandShortName; is made available to you under the terms of the ">
 <!ENTITY rights.intro-point1b "Mozilla Public License">
 <!ENTITY rights.intro-point1c ". This means you may use, copy and distribute &brandShortName; to others.  You are also welcome to modify the source code of &brandShortName; as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions.">
 
-<!ENTITY rights.intro-point2a "Mozilla does not grant you any rights to the Mozilla and Firefox trademarks or logos. Additional information on Trademarks may be found ">
-<!ENTITY rights.intro-point2b "here">
-<!ENTITY rights.intro-point2c ".">
+<!ENTITY rights.intro-point2-a "You are not granted any trademark rights or licenses to the trademarks of the Mozilla Foundation or any party, including without limitation the Firefox name or logo. Additional information on trademarks may be found ">
+<!ENTITY rights.intro-point2-b "here">
+<!ENTITY rights.intro-point2-c ".">
 
 <!-- point 3 text for official branded builds -->
 <!ENTITY rights.intro-point3a "Privacy policies for &vendorShortName;'s products may be found ">
 <!ENTITY rights.intro-point3b "here">
 <!ENTITY rights.intro-point3c ".">
 
 <!-- point 3 text for unbranded builds -->
 <!ENTITY rights.intro-point3-unbranded "Any applicable privacy policies for this product should be listed here.">