Bug 714140 - Charlton Company trademark notice can be removed from About dialog. r=gavin

browser/base/content/aboutDialog.css

@@ -57,7 +57,6 @@
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
 }
 
-.trademark-label,
 .text-link,
 .text-link:focus {
   margin: 0px;

browser/base/content/aboutDialog.js

@@ -77,17 +77,6 @@ function init(aEvent)
     document.getElementById("communityDesc").hidden = true;
   }
 
-#ifdef MOZ_OFFICIAL_BRANDING
-  // Hide the Charlton trademark attribution for non-en-US/en-GB
-  // DO NOT REMOVE without consulting people involved with bug 616193
-  let chromeRegistry = Components.classes["@mozilla.org/chrome/chrome-registry;1"].
-                       getService(Components.interfaces.nsIXULChromeRegistry);
-  let currentLocale = chromeRegistry.getSelectedLocale("global");
-  if (currentLocale != "en-US" && currentLocale != "en-GB") {
-    document.getElementById("extra-trademark").hidden = true;
-  }
-#endif
-
 #ifdef MOZ_UPDATER
   gAppUpdater = new appUpdater();
 

browser/base/content/aboutDialog.xul

@@ -146,13 +146,7 @@
         <label class="text-link bottom-link" href="about:rights">&bottomLinks.rights;</label>
         <label class="text-link bottom-link" href="http://www.mozilla.com/legal/privacy/">&bottomLinks.privacy;</label>
       </hbox>
-      <description id="trademark">
-        <label class="trademark-label">&trademarkInfo.part1;</label>
-#ifdef MOZ_OFFICIAL_BRANDING
-        <!-- DO NOT REMOVE without consulting people involved with bug 616193 -->
-        <label id="extra-trademark" class="trademark-label">Some of the trademarks used under license from The Charlton Company.</label>
-#endif
-      </description>
+      <description id="trademark">&trademarkInfo.part1;</description>
     </vbox>
   </vbox>