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
-
3cad3836
by Henry Wilkes at 2024-03-26T17:47:47+00:00
-
37b97c98
by Henry Wilkes at 2024-03-26T17:47:47+00:00
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:
| ... | ... | @@ -20,7 +20,7 @@ |
| 20 | 20 | data-l10n-id="aboutDialog-title"
|
| 21 | 21 | #endif
|
| 22 | 22 | role="dialog"
|
| 23 | - aria-describedby="version distribution distributionId projectDesc helpDesc trademark trademarkTor"
|
|
| 23 | + aria-describedby="version distribution distributionId projectDesc helpDesc trademark"
|
|
| 24 | 24 | >
|
| 25 | 25 | #ifdef XP_MACOSX
|
| 26 | 26 | #include macWindow.inc.xhtml
|
| ... | ... | @@ -150,7 +150,6 @@ |
| 150 | 150 | <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="about-dialog-browser-license-link"></label>
|
| 151 | 151 | </hbox>
|
| 152 | 152 | <description id="trademark" data-l10n-id="trademarkInfo"></description>
|
| 153 | - <description id="trademarkTor" data-l10n-id="about-dialog-trademark-statement"></description>
|
|
| 154 | 153 | </vbox>
|
| 155 | 154 | </html:div>
|
| 156 | 155 |
| ... | ... | @@ -18,15 +18,10 @@ |
| 18 | 18 | }
|
| 19 | 19 | |
| 20 | 20 | #trademark {
|
| 21 | - display: none;
|
|
| 22 | -}
|
|
| 23 | - |
|
| 24 | -#trademarkTor {
|
|
| 25 | 21 | font-size: xx-small;
|
| 26 | 22 | text-align: center;
|
| 27 | 23 | color: #999999;
|
| 28 | - margin-top: 10px;
|
|
| 29 | - margin-bottom: 10px;
|
|
| 24 | + margin-block: 10px;
|
|
| 30 | 25 | }
|
| 31 | 26 | |
| 32 | 27 | #bottomBox > hbox:not(#newBottom) {
|
| ... | ... | @@ -323,10 +323,6 @@ about-dialog-grow-tor-network-link = Help the Tor Network Grow! |
| 323 | 323 | # Link text for the Tor Browser license page (about:license).
|
| 324 | 324 | about-dialog-browser-license-link = Licensing Information
|
| 325 | 325 | |
| 326 | -# "Tor" and "The Onion Logo" are trademark names, so should not be translated (not including the quote marks, which can be localized).
|
|
| 327 | -# "The Tor Project, Inc." is an organisation name.
|
|
| 328 | -about-dialog-trademark-statement = “Tor” and “The Onion Logo” are registered trademarks of The Tor Project, Inc.
|
|
| 329 | - |
|
| 330 | 326 | ## New tor circuit.
|
| 331 | 327 | |
| 332 | 328 | # Shown in the File menu.
|
| ... | ... | @@ -9,4 +9,6 @@ |
| 9 | 9 | # remain unchanged across different versions (Nightly, Beta, etc.).
|
| 10 | 10 | -brand-product-name = Tor Browser
|
| 11 | 11 | -vendor-short-name = Tor Project
|
| 12 | -trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc. |
|
| 12 | +# "Tor" is a trademark names, so should not be translated (not including the quote marks, which can be localized).
|
|
| 13 | +# "The Tor Project, Inc." is an organisation name.
|
|
| 14 | +trademarkInfo = “Tor” and the Tor logo are registered trademarks of The Tor Project, Inc. |