[tbb-commits] [Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] 3 commits: fixup! Bug 2176: Rebrand Firefox to TorBrowser

[richard (@richard)]

richard pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser


Commits:
1ce353d9 by Henry Wilkes at 2024-03-26T17:47:47+00:00
fixup! Bug 2176: Rebrand Firefox to TorBrowser

Bug 42466: Use the existing #trademark element from mozilla for Tor
Browser's trademark statement.

- - - - -
3cad3836 by Henry Wilkes at 2024-03-26T17:47:47+00:00
fixup! Tor Browser strings

Bug 42466: Change trademark statement to remove "onion logo", and move
it to brand.ftl.

- - - - -
37b97c98 by Henry Wilkes at 2024-03-26T17:47:47+00:00
fixup! Add TorStrings module for localization

Bug 42466: Remove "onion logo" from trademark statement and move it to
brand.ftl.

- - - - -


4 changed files:

- browser/base/content/aboutDialog.xhtml
- browser/base/content/aboutDialogTor.css
- browser/locales/en-US/browser/tor-browser.ftl
- toolkit/torbutton/chrome/locale/en-US/branding/brand.ftl


Changes:

=====================================
browser/base/content/aboutDialog.xhtml
=====================================
@@ -20,7 +20,7 @@
         data-l10n-id="aboutDialog-title"
 #endif
         role="dialog"
-        aria-describedby="version distribution distributionId projectDesc helpDesc trademark trademarkTor"
+        aria-describedby="version distribution distributionId projectDesc helpDesc trademark"
         >
 #ifdef XP_MACOSX
 #include macWindow.inc.xhtml
@@ -150,7 +150,6 @@
         <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="about-dialog-browser-license-link"></label>
       </hbox>
       <description id="trademark" data-l10n-id="trademarkInfo"></description>
-      <description id="trademarkTor" data-l10n-id="about-dialog-trademark-statement"></description>
     </vbox>
   </html:div>
 


=====================================
browser/base/content/aboutDialogTor.css
=====================================
@@ -18,15 +18,10 @@
 }
 
 #trademark {
-  display: none;
-}
-
-#trademarkTor {
   font-size: xx-small;
   text-align: center;
   color: #999999;
-  margin-top: 10px;
-  margin-bottom: 10px;
+  margin-block: 10px;
 }
 
 #bottomBox > hbox:not(#newBottom) {


=====================================
browser/locales/en-US/browser/tor-browser.ftl
=====================================
@@ -323,10 +323,6 @@ about-dialog-grow-tor-network-link = Help the Tor Network Grow!
 # Link text for the Tor Browser license page (about:license).
 about-dialog-browser-license-link = Licensing Information
 
-# "Tor" and "The Onion Logo" are trademark names, so should not be translated (not including the quote marks, which can be localized).
-# "The Tor Project, Inc." is an organisation name.
-about-dialog-trademark-statement = “Tor” and “The Onion Logo” are registered trademarks of The Tor Project, Inc.
-
 ## New tor circuit.
 
 # Shown in the File menu.


=====================================
toolkit/torbutton/chrome/locale/en-US/branding/brand.ftl
=====================================
@@ -9,4 +9,6 @@
 # remain unchanged across different versions (Nightly, Beta, etc.).
 -brand-product-name = Tor Browser
 -vendor-short-name = Tor Project
-trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.
+# "Tor" is a trademark names, so should not be translated (not including the quote marks, which can be localized).
+# "The Tor Project, Inc." is an organisation name.
+trademarkInfo = “Tor” and the Tor logo are registered trademarks of The Tor Project, Inc.



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/570b6c56cdf1ee29c68c28c878aba566b5fec967...37b97c98ad119338bb2c14d9a119500b222f0971

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/570b6c56cdf1ee29c68c28c878aba566b5fec967...37b97c98ad119338bb2c14d9a119500b222f0971
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tbb-commits/attachments/20240326/a7308729/attachment-0001.htm>