Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor 
Project / Applications / Tor Browser


Commits:
5b8b20de by Henry Wilkes at 2024-12-04T10:18:40+00:00
fixup! Tor Browser strings

Bug 43336: Move branding strings from torbutton to browser/branding.

- - - - -
d8041158 by Henry Wilkes at 2024-12-04T10:19:19+00:00
fixup! Add TorStrings module for localization

Bug 43336: Move branding strings out of torbutton.

- - - - -


10 changed files:

- toolkit/torbutton/chrome/locale/en-US/branding/brand.ftl → 
browser/branding/tb-alpha/locales/en-US/brand.ftl
- toolkit/torbutton/chrome/locale/en-US/brand.properties → 
browser/branding/tb-alpha/locales/en-US/brand.properties
- browser/branding/tb-alpha/locales/jar.mn
- + browser/branding/tb-nightly/locales/en-US/brand.ftl
- + browser/branding/tb-nightly/locales/en-US/brand.properties
- browser/branding/tb-nightly/locales/jar.mn
- + browser/branding/tb-release/locales/en-US/brand.ftl
- + browser/branding/tb-release/locales/en-US/brand.properties
- browser/branding/tb-release/locales/jar.mn
- toolkit/torbutton/jar.mn


Changes:

=====================================
toolkit/torbutton/chrome/locale/en-US/branding/brand.ftl → 
browser/branding/tb-alpha/locales/en-US/brand.ftl
=====================================


=====================================
toolkit/torbutton/chrome/locale/en-US/brand.properties → 
browser/branding/tb-alpha/locales/en-US/brand.properties
=====================================


=====================================
browser/branding/tb-alpha/locales/jar.mn
=====================================
@@ -3,4 +3,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# We provide all brand files in torbutton
+[localization] @AB_CD@.jar:
+  branding                                          (%*.ftl)
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+  locale/branding/brand.properties (%brand.properties)


=====================================
browser/branding/tb-nightly/locales/en-US/brand.ftl
=====================================
@@ -0,0 +1,14 @@
+# For Tor Browser, we use a new file (different than the brand.ftl file
+# that is used by Firefox) to avoid picking up the -brand-short-name values
+# that Mozilla includes in the Firefox language packs.
+
+-brand-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+# "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.


=====================================
browser/branding/tb-nightly/locales/en-US/brand.properties
=====================================
@@ -0,0 +1,8 @@
+# Copyright (c) 2022, The Tor Project, Inc.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+brandShorterName=Tor Browser
+brandShortName=Tor Browser
+brandFullName=Tor Browser


=====================================
browser/branding/tb-nightly/locales/jar.mn
=====================================
@@ -3,4 +3,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# We provide all brand files in torbutton
+[localization] @AB_CD@.jar:
+  branding                                          (%*.ftl)
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+  locale/branding/brand.properties (%brand.properties)


=====================================
browser/branding/tb-release/locales/en-US/brand.ftl
=====================================
@@ -0,0 +1,14 @@
+# For Tor Browser, we use a new file (different than the brand.ftl file
+# that is used by Firefox) to avoid picking up the -brand-short-name values
+# that Mozilla includes in the Firefox language packs.
+
+-brand-shorter-name = Tor Browser
+-brand-short-name = Tor Browser
+-brand-full-name = Tor Browser
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Tor Browser
+-vendor-short-name = Tor Project
+# "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.


=====================================
browser/branding/tb-release/locales/en-US/brand.properties
=====================================
@@ -0,0 +1,8 @@
+# Copyright (c) 2022, The Tor Project, Inc.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+brandShorterName=Tor Browser
+brandShortName=Tor Browser
+brandFullName=Tor Browser


=====================================
browser/branding/tb-release/locales/jar.mn
=====================================
@@ -3,4 +3,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# We provide all brand files in torbutton
+[localization] @AB_CD@.jar:
+  branding                                          (%*.ftl)
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+  locale/branding/brand.properties (%brand.properties)


=====================================
toolkit/torbutton/jar.mn
=====================================
@@ -4,8 +4,5 @@ torbutton.jar:
 % resource torbutton %
 % category l10n-registry torbutton resource://torbutton/locale/{locale}/
 
-# browser branding
-% override chrome://branding/locale/brand.properties 
chrome://torbutton/locale/brand.properties
-
 % locale torbutton en-US %locale/en-US/
   locale/en-US/ (chrome/locale/en-US/*)



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/395fc108109bfaccb41e0dbdd4216ceec2b7b6fe...d804115890fc5dec633576726dcef2c5d5c23554

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/395fc108109bfaccb41e0dbdd4216ceec2b7b6fe...d804115890fc5dec633576726dcef2c5d5c23554
You're receiving this email because of your account on gitlab.torproject.org.


_______________________________________________
tbb-commits mailing list -- tbb-commits@lists.torproject.org
To unsubscribe send an email to tbb-commits-le...@lists.torproject.org

Reply via email to