Browse Source

Bug 1515507 - Update SM Web Site to include references to SM EV (TradeMark) and SM EV (Domain). r=me

Ian Neal 2 years ago
parent
commit
033fe9b799
3 changed files with 12 additions and 11 deletions
  1. 2 2
      lib/wrapper.tmpl
  2. 5 5
      src/dev/artwork.en.html
  3. 5 4
      src/legal/trademark.en.html

+ 2 - 2
lib/wrapper.tmpl

@@ -32,7 +32,7 @@
     strings.TrademarkPre  = "SeaMonkey and the SeaMonkey logo are "
     strings.TrademarkPre  = "SeaMonkey and the SeaMonkey logo are "
     strings.TrademarkLink = "registered trademarks"
     strings.TrademarkLink = "registered trademarks"
     strings.TrademarkMid  = " of the "
     strings.TrademarkMid  = " of the "
-    strings.TrademarkMoFo = "Mozilla Foundation"
+    strings.TrademarkSMEV = "SeaMonkey Association (SeaMonkey e.V.)"
     strings.TrademarkPost = "."
     strings.TrademarkPost = "."
     strings.LicenseCC     = "Portions of this content are © 1998–$currentyear by individual mozilla.org contributors; content available under a Creative Commons license"
     strings.LicenseCC     = "Portions of this content are © 1998–$currentyear by individual mozilla.org contributors; content available under a Creative Commons license"
     strings.Details       = "Details"
     strings.Details       = "Details"
@@ -163,7 +163,7 @@
         <li><a href="[% toplink %]about">[% strings.About %]</a></li>
         <li><a href="[% toplink %]about">[% strings.About %]</a></li>
         <li><a href="[% toplink %]about#contact">[% strings.Contact %]</a></li>
         <li><a href="[% toplink %]about#contact">[% strings.Contact %]</a></li>
       </ul>
       </ul>
-      <p class="tLicense">[% strings.TrademarkPre %]<a href="[% toplink %]legal/trademark">[% strings.TrademarkLink %]</a>[% strings.TrademarkMid %]<a href="http://www.mozilla.org/foundation/">[% strings.TrademarkMoFo %]</a>[% strings.TrademarkPost %]</p>
+      <p class="tLicense">[% strings.TrademarkPre %]<a href="[% toplink %]legal/trademark">[% strings.TrademarkLink %]</a>[% strings.TrademarkMid %]<a href="[% toplink %]">[% strings.TrademarkSMEV %]</a>[% strings.TrademarkPost %]</p>
       <p class="tLicense">[% strings.LicenseCC %] | <a href="http://www.mozilla.org/foundation/licensing/website-content.html">[% strings.Details %]</a>.</p>
       <p class="tLicense">[% strings.LicenseCC %] | <a href="http://www.mozilla.org/foundation/licensing/website-content.html">[% strings.Details %]</a>.</p>
       [% IF document.links.license -%]
       [% IF document.links.license -%]
       <p class="tLicense">[% strings.LicenseIs %]
       <p class="tLicense">[% strings.LicenseIs %]

+ 5 - 5
src/dev/artwork.en.html

@@ -67,12 +67,12 @@ dynamic the internet suite application has gained through the new project.
 <p>
 <p>
 Above images show the SeaMonkey logo in different sizes, from 96px down to
 Above images show the SeaMonkey logo in different sizes, from 96px down to
 16px. The SeaMonkey word and logo are registered as US trademarks by the
 16px. The SeaMonkey word and logo are registered as US trademarks by the
-Mozilla Foundation, and these logo images are also owned by the Mozilla
-Foundation (the SeaMonkey project is legally represented by the SeaMonkey
-Association), but they are free to use for promotion of our project and
-application. Some versions of the logo and derived artwork are used in the
+SeaMonkey Association (SeaMonkey e.V.), and these logo images are also owned by
+the SeaMonkey Association (the SeaMonkey project is legally represented by the
+SeaMonkey Association), but they are free to use for promotion of our project
+and application. Some versions of the logo and derived artwork are used in the
 project code repository and the final SeaMonkey application, and provided under
 project code repository and the final SeaMonkey application, and provided under
-the <a href="http://www.mozilla.org/MPL/">Mozilla Public License 2.0 (MPL)</a>
+the <a href="https://www.mozilla.org/MPL/">Mozilla Public License 2.0 (MPL)</a>
 for that purpose.
 for that purpose.
 </p>
 </p>
 
 

+ 5 - 4
src/legal/trademark.en.html

@@ -34,9 +34,10 @@ trademark policy</a> unless explicitly granted by the SeaMonkey Council.
 <h2 id="usage">SeaMonkey Trademark Usage Policy</h2>
 <h2 id="usage">SeaMonkey Trademark Usage Policy</h2>
 
 
 <p>
 <p>
-SeaMonkey and the SeaMonkey logo are all trademarks of the Mozilla Foundation.
-Before using any of these marks outside the scope of fair use (such as
-using these in a review to refer to the product), please send an email to
+SeaMonkey and the SeaMonkey logo are all trademarks of the SeaMonkey
+Association (SeaMonkey e.V.). Before using any of these marks outside the scope
+of fair use (such as using these in a review to refer to the product), please
+send an email to
 <a href="mailto:seamonkey-council@mozilla.org">seamonkey-council@mozilla.org</a>
 <a href="mailto:seamonkey-council@mozilla.org">seamonkey-council@mozilla.org</a>
 with your name, contact details, and a short explanation of your proposed usage
 with your name, contact details, and a short explanation of your proposed usage
 of the trademarks. We will answer these mails as quickly as we can, so you can
 of the trademarks. We will answer these mails as quickly as we can, so you can
@@ -64,7 +65,7 @@ If you have any questions at all about your proposed use, please contact us.
 
 
 <p>
 <p>
 Where possible, we ask that SeaMonkey-related domain ownership be held by the
 Where possible, we ask that SeaMonkey-related domain ownership be held by the
-SeaMonkey Council, Mozilla Foundation, or a Mozilla Foundation-authorised
+SeaMonkey Council, SeaMonkey Association, or a SeaMonkey Association-authorised
 organisation. Please ask for a trademark license before registering a domain
 organisation. Please ask for a trademark license before registering a domain
 which incorporates the SeaMonkey name. In the future (when we have funds!), we
 which incorporates the SeaMonkey name. In the future (when we have funds!), we
 may sponsor registration fees for approved domains, and leave technical
 may sponsor registration fees for approved domains, and leave technical