[tbb-commits] [tor-browser] 01/02: fixup! Bug 2176: Rebrand Firefox to TorBrowser
gitolite role
git at cupani.torproject.org
Tue Nov 8 13:07:10 UTC 2022
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-2
in repository tor-browser.
commit e94b4fd243ec5a03737d897cdc633e9068da646f
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Wed Nov 2 18:04:06 2022 +0100
fixup! Bug 2176: Rebrand Firefox to TorBrowser
Bug 41420: Remove brand.dtd customization on nightly
---
browser/branding/alpha/locales/en-US/brand.dtd | 11 ---------
browser/branding/alpha/locales/en-US/brand.ftl | 26 ----------------------
.../branding/alpha/locales/en-US/brand.properties | 14 ------------
browser/branding/alpha/locales/jar.mn | 8 +------
browser/branding/nightly/locales/en-US/brand.dtd | 2 +-
browser/branding/nightly/locales/en-US/brand.ftl | 2 +-
.../nightly/locales/en-US/brand.properties | 6 ++---
browser/branding/nightly/locales/jar.mn | 8 +------
browser/branding/official/locales/en-US/brand.dtd | 2 +-
.../official/locales/en-US/brand.properties | 6 ++---
browser/branding/official/locales/jar.mn | 8 +------
browser/branding/unofficial/locales/jar.mn | 9 +-------
mobile/android/branding/beta/locales/jar.mn | 9 +-------
mobile/android/branding/nightly/locales/jar.mn | 9 +-------
mobile/android/branding/official/locales/jar.mn | 9 +-------
mobile/android/branding/unofficial/locales/jar.mn | 9 +-------
16 files changed, 17 insertions(+), 121 deletions(-)
diff --git a/browser/branding/alpha/locales/en-US/brand.dtd b/browser/branding/alpha/locales/en-US/brand.dtd
deleted file mode 100644
index 0b15c9978e01..000000000000
--- a/browser/branding/alpha/locales/en-US/brand.dtd
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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/. -->
-
-<!ENTITY brandShorterName "Tor Browser">
-<!ENTITY brandShortName "Tor Browser">
-<!ENTITY brandFullName "Tor Browser">
-<!-- LOCALIZATION NOTE (brandProductName):
- This brand name can be used in messages where the product name needs to
- remain unchanged across different versions (Nightly, Beta, etc.). -->
-<!ENTITY brandProductName "Tor Browser">
diff --git a/browser/branding/alpha/locales/en-US/brand.ftl b/browser/branding/alpha/locales/en-US/brand.ftl
deleted file mode 100644
index e970d32cb43e..000000000000
--- a/browser/branding/alpha/locales/en-US/brand.ftl
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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/.
-
-## Firefox and Mozilla Brand
-##
-## Firefox and Mozilla must be treated as a brand.
-##
-## They cannot be:
-## - Transliterated.
-## - Translated.
-##
-## Declension should be avoided where possible, leaving the original
-## brand unaltered in prominent UI positions.
-##
-## For further details, consult:
-## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark
-
--brand-shorter-name = Nightly
--brand-short-name = Nightly
--brand-full-name = Firefox Nightly
-# 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 = Firefox
--vendor-short-name = Mozilla
-trademarkInfo = Firefox and the Firefox logos are trademarks of the Mozilla Foundation.
diff --git a/browser/branding/alpha/locales/en-US/brand.properties b/browser/branding/alpha/locales/en-US/brand.properties
deleted file mode 100644
index e96b063b9034..000000000000
--- a/browser/branding/alpha/locales/en-US/brand.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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
-# LOCALIZATION NOTE(brandProductName):
-# This brand name can be used in messages where the product name needs to
-# remain unchanged across different versions (Nightly, Beta, etc.).
-brandProductName=Tor Browser
-vendorShortName=Tor Project
-
-syncBrandShortName=Sync
diff --git a/browser/branding/alpha/locales/jar.mn b/browser/branding/alpha/locales/jar.mn
index d13c2110148f..dce4a921fde7 100644
--- a/browser/branding/alpha/locales/jar.mn
+++ b/browser/branding/alpha/locales/jar.mn
@@ -3,10 +3,4 @@
# 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/.
-[localization] @AB_CD at .jar:
- branding (%*.ftl)
-
- at AB_CD@.jar:
-% locale branding @AB_CD@ %locale/branding/
- locale/branding/brand.dtd (%brand.dtd)
- locale/branding/brand.properties (%brand.properties)
+# We provide all brand files in torbutton
diff --git a/browser/branding/nightly/locales/en-US/brand.dtd b/browser/branding/nightly/locales/en-US/brand.dtd
index b005cdf5ed0c..ac881cd35fca 100644
--- a/browser/branding/nightly/locales/en-US/brand.dtd
+++ b/browser/branding/nightly/locales/en-US/brand.dtd
@@ -2,4 +2,4 @@
- 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/. -->
-<!ENTITY brandShortName "Tor Browser">
+<!ENTITY brandShortName "Nightly">
diff --git a/browser/branding/nightly/locales/en-US/brand.ftl b/browser/branding/nightly/locales/en-US/brand.ftl
index e970d32cb43e..f633bc269f58 100644
--- a/browser/branding/nightly/locales/en-US/brand.ftl
+++ b/browser/branding/nightly/locales/en-US/brand.ftl
@@ -23,4 +23,4 @@
# remain unchanged across different versions (Nightly, Beta, etc.).
-brand-product-name = Firefox
-vendor-short-name = Mozilla
-trademarkInfo = Firefox and the Firefox logos are trademarks of the Mozilla Foundation.
+trademarkInfo = { " " }
diff --git a/browser/branding/nightly/locales/en-US/brand.properties b/browser/branding/nightly/locales/en-US/brand.properties
index b1e40a5a9f14..e84fdd07d46b 100644
--- a/browser/branding/nightly/locales/en-US/brand.properties
+++ b/browser/branding/nightly/locales/en-US/brand.properties
@@ -2,6 +2,6 @@
# 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
+brandShorterName=Nightly
+brandShortName=Nightly
+brandFullName=Firefox Nightly
diff --git a/browser/branding/nightly/locales/jar.mn b/browser/branding/nightly/locales/jar.mn
index d13c2110148f..dce4a921fde7 100644
--- a/browser/branding/nightly/locales/jar.mn
+++ b/browser/branding/nightly/locales/jar.mn
@@ -3,10 +3,4 @@
# 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/.
-[localization] @AB_CD at .jar:
- branding (%*.ftl)
-
- at AB_CD@.jar:
-% locale branding @AB_CD@ %locale/branding/
- locale/branding/brand.dtd (%brand.dtd)
- locale/branding/brand.properties (%brand.properties)
+# We provide all brand files in torbutton
diff --git a/browser/branding/official/locales/en-US/brand.dtd b/browser/branding/official/locales/en-US/brand.dtd
index b005cdf5ed0c..b5474b4c99e9 100644
--- a/browser/branding/official/locales/en-US/brand.dtd
+++ b/browser/branding/official/locales/en-US/brand.dtd
@@ -2,4 +2,4 @@
- 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/. -->
-<!ENTITY brandShortName "Tor Browser">
+<!ENTITY brandShortName "Firefox">
diff --git a/browser/branding/official/locales/en-US/brand.properties b/browser/branding/official/locales/en-US/brand.properties
index b1e40a5a9f14..e19952690248 100644
--- a/browser/branding/official/locales/en-US/brand.properties
+++ b/browser/branding/official/locales/en-US/brand.properties
@@ -2,6 +2,6 @@
# 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
+brandShorterName=Firefox
+brandShortName=Firefox
+brandFullName=Mozilla Firefox
diff --git a/browser/branding/official/locales/jar.mn b/browser/branding/official/locales/jar.mn
index d13c2110148f..dce4a921fde7 100644
--- a/browser/branding/official/locales/jar.mn
+++ b/browser/branding/official/locales/jar.mn
@@ -3,10 +3,4 @@
# 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/.
-[localization] @AB_CD at .jar:
- branding (%*.ftl)
-
- at AB_CD@.jar:
-% locale branding @AB_CD@ %locale/branding/
- locale/branding/brand.dtd (%brand.dtd)
- locale/branding/brand.properties (%brand.properties)
+# We provide all brand files in torbutton
diff --git a/browser/branding/unofficial/locales/jar.mn b/browser/branding/unofficial/locales/jar.mn
index d007b20fdc4a..dce4a921fde7 100644
--- a/browser/branding/unofficial/locales/jar.mn
+++ b/browser/branding/unofficial/locales/jar.mn
@@ -3,11 +3,4 @@
# 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/.
-[localization] @AB_CD at .jar:
- branding (en-US/**/*.ftl)
-
- at AB_CD@.jar:
-% locale branding @AB_CD@ %locale/branding/
-# Unofficial branding only exists in en-US
- locale/branding/brand.dtd (en-US/brand.dtd)
- locale/branding/brand.properties (en-US/brand.properties)
+# We provide all brand files in torbutton
diff --git a/mobile/android/branding/beta/locales/jar.mn b/mobile/android/branding/beta/locales/jar.mn
index 60454ebba353..dce4a921fde7 100644
--- a/mobile/android/branding/beta/locales/jar.mn
+++ b/mobile/android/branding/beta/locales/jar.mn
@@ -3,11 +3,4 @@
# 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/.
-[localization] @AB_CD at .jar:
- branding (en-US/**/*.ftl)
-
- at AB_CD@.jar:
-% locale branding @AB_CD@ %locale/branding/
-# Branding only exists in en-US
- locale/branding/brand.dtd (en-US/brand.dtd)
- locale/branding/brand.properties (en-US/brand.properties)
+# We provide all brand files in torbutton
diff --git a/mobile/android/branding/nightly/locales/jar.mn b/mobile/android/branding/nightly/locales/jar.mn
index 38599a0de011..dce4a921fde7 100644
--- a/mobile/android/branding/nightly/locales/jar.mn
+++ b/mobile/android/branding/nightly/locales/jar.mn
@@ -3,11 +3,4 @@
# 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/.
-[localization] @AB_CD at .jar:
- branding (en-US/**/*.ftl)
-
- at AB_CD@.jar:
-% locale branding @AB_CD@ %locale/branding/
-# Nightly branding only exists in en-US
- locale/branding/brand.dtd (en-US/brand.dtd)
- locale/branding/brand.properties (en-US/brand.properties)
+# We provide all brand files in torbutton
diff --git a/mobile/android/branding/official/locales/jar.mn b/mobile/android/branding/official/locales/jar.mn
index 60454ebba353..dce4a921fde7 100644
--- a/mobile/android/branding/official/locales/jar.mn
+++ b/mobile/android/branding/official/locales/jar.mn
@@ -3,11 +3,4 @@
# 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/.
-[localization] @AB_CD at .jar:
- branding (en-US/**/*.ftl)
-
- at AB_CD@.jar:
-% locale branding @AB_CD@ %locale/branding/
-# Branding only exists in en-US
- locale/branding/brand.dtd (en-US/brand.dtd)
- locale/branding/brand.properties (en-US/brand.properties)
+# We provide all brand files in torbutton
diff --git a/mobile/android/branding/unofficial/locales/jar.mn b/mobile/android/branding/unofficial/locales/jar.mn
index 38599a0de011..dce4a921fde7 100644
--- a/mobile/android/branding/unofficial/locales/jar.mn
+++ b/mobile/android/branding/unofficial/locales/jar.mn
@@ -3,11 +3,4 @@
# 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/.
-[localization] @AB_CD at .jar:
- branding (en-US/**/*.ftl)
-
- at AB_CD@.jar:
-% locale branding @AB_CD@ %locale/branding/
-# Nightly branding only exists in en-US
- locale/branding/brand.dtd (en-US/brand.dtd)
- locale/branding/brand.properties (en-US/brand.properties)
+# We provide all brand files in torbutton
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the tbb-commits
mailing list