Bug 1539620 - Add a brand product string that doesn't change across different channels r=Pike a=pascalc l10n=flod
authorFrancesco Lodolo (:flod) <flod@lodolo.net>
Thu, 28 Mar 2019 11:44:41 +0000
changeset 526404 902828c898591b890142e6fa2700f7ccb84f4bb0
parent 526403 04d85464692c8999b5e1c41e14505fff67ac1fb8
child 526405 92301b3c417368aec6536f4cf34c40897c857a6f
push id2032
push userffxbld-merge
push dateMon, 13 May 2019 09:36:57 +0000
treeherdermozilla-release@455c1065dcbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersPike, pascalc
bugs1539620
milestone67.0
Bug 1539620 - Add a brand product string that doesn't change across different channels r=Pike a=pascalc l10n=flod Differential Revision: https://phabricator.services.mozilla.com/D25193
browser/branding/aurora/locales/en-US/brand.dtd
browser/branding/aurora/locales/en-US/brand.ftl
browser/branding/aurora/locales/en-US/brand.properties
browser/branding/nightly/locales/en-US/brand.dtd
browser/branding/nightly/locales/en-US/brand.ftl
browser/branding/nightly/locales/en-US/brand.properties
browser/branding/official/locales/en-US/brand.dtd
browser/branding/official/locales/en-US/brand.ftl
browser/branding/official/locales/en-US/brand.properties
browser/branding/unofficial/locales/en-US/brand.dtd
browser/branding/unofficial/locales/en-US/brand.ftl
browser/branding/unofficial/locales/en-US/brand.properties
mobile/android/branding/beta/locales/en-US/brand.dtd
mobile/android/branding/beta/locales/en-US/brand.ftl
mobile/android/branding/beta/locales/en-US/brand.properties
mobile/android/branding/nightly/locales/en-US/brand.dtd
mobile/android/branding/nightly/locales/en-US/brand.ftl
mobile/android/branding/nightly/locales/en-US/brand.properties
mobile/android/branding/official/locales/en-US/brand.dtd
mobile/android/branding/official/locales/en-US/brand.ftl
mobile/android/branding/official/locales/en-US/brand.properties
mobile/android/branding/unofficial/locales/en-US/brand.dtd
mobile/android/branding/unofficial/locales/en-US/brand.ftl
mobile/android/branding/unofficial/locales/en-US/brand.properties
--- a/browser/branding/aurora/locales/en-US/brand.dtd
+++ b/browser/branding/aurora/locales/en-US/brand.dtd
@@ -1,9 +1,13 @@
 <!-- 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      "Firefox">
 <!ENTITY  brandShortName        "Firefox Developer Edition">
 <!ENTITY  brandFullName         "Firefox Developer Edition">
+<!-- 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      "Firefox">
 <!ENTITY  vendorShortName       "Mozilla">
 <!ENTITY  trademarkInfo.part1   " ">
--- a/browser/branding/aurora/locales/en-US/brand.ftl
+++ b/browser/branding/aurora/locales/en-US/brand.ftl
@@ -7,13 +7,16 @@
 ## Firefox and Mozilla must be treated as a brand, and kept in English.
 ## It cannot be:
 ## - Declined to adapt to grammatical case.
 ## - Transliterated.
 ## - Translated.
 ##
 ## Reference: https://www.mozilla.org/styleguide/communications/translation/
 
+-brand-shorter-name = Firefox
 -brand-short-name = Firefox Developer Edition
--vendor-short-name = Mozilla
 -brand-full-name = Firefox Developer Edition
--brand-shorter-name = Firefox
+# 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 = { " " }
--- a/browser/branding/aurora/locales/en-US/brand.properties
+++ b/browser/branding/aurora/locales/en-US/brand.properties
@@ -1,10 +1,14 @@
 # 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=Firefox
 brandShortName=Firefox Developer Edition
 brandFullName=Firefox Developer Edition
+# 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=Firefox
 vendorShortName=Mozilla
 
 syncBrandShortName=Sync
--- a/browser/branding/nightly/locales/en-US/brand.dtd
+++ b/browser/branding/nightly/locales/en-US/brand.dtd
@@ -1,9 +1,13 @@
 <!-- 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      "Nightly">
 <!ENTITY  brandShortName        "Nightly">
 <!ENTITY  brandFullName         "Firefox Nightly">
+<!-- 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      "Firefox">
 <!ENTITY  vendorShortName       "Mozilla">
 <!ENTITY  trademarkInfo.part1   " ">
--- a/browser/branding/nightly/locales/en-US/brand.ftl
+++ b/browser/branding/nightly/locales/en-US/brand.ftl
@@ -7,13 +7,16 @@
 ## Firefox must be treated as a brand, and kept in English.
 ## It cannot be:
 ## - Declined to adapt to grammatical case.
 ## - Transliterated.
 ## - Translated.
 ##
 ## Reference: https://www.mozilla.org/styleguide/communications/translation/
 
+-brand-shorter-name = Nightly
 -brand-short-name = Nightly
--vendor-short-name = Mozilla
 -brand-full-name = Firefox Nightly
--brand-shorter-name = 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 = { " " }
--- a/browser/branding/nightly/locales/en-US/brand.properties
+++ b/browser/branding/nightly/locales/en-US/brand.properties
@@ -1,10 +1,14 @@
 # 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=Nightly
 brandShortName=Nightly
 brandFullName=Firefox Nightly
+# 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=Firefox
 vendorShortName=Mozilla
 
 syncBrandShortName=Sync
--- a/browser/branding/official/locales/en-US/brand.dtd
+++ b/browser/branding/official/locales/en-US/brand.dtd
@@ -1,9 +1,13 @@
 <!-- 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      "Firefox">
 <!ENTITY  brandShortName        "Firefox">
 <!ENTITY  brandFullName         "Mozilla Firefox">
+<!-- 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      "Firefox">
 <!ENTITY  vendorShortName       "Mozilla">
 <!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
--- a/browser/branding/official/locales/en-US/brand.ftl
+++ b/browser/branding/official/locales/en-US/brand.ftl
@@ -7,13 +7,16 @@
 ## Firefox must be treated as a brand, and kept in English.
 ## It cannot be:
 ## - Declined to adapt to grammatical case.
 ## - Transliterated.
 ## - Translated.
 ##
 ## Reference: https://www.mozilla.org/styleguide/communications/translation/
 
+-brand-shorter-name = Firefox
 -brand-short-name = Firefox
--vendor-short-name = Mozilla
 -brand-full-name = Mozilla Firefox
--brand-shorter-name = Firefox
+# 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.
--- a/browser/branding/official/locales/en-US/brand.properties
+++ b/browser/branding/official/locales/en-US/brand.properties
@@ -1,10 +1,14 @@
 # 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=Firefox
 brandShortName=Firefox
 brandFullName=Mozilla Firefox
+# 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=Firefox
 vendorShortName=Mozilla
 
 syncBrandShortName=Sync
--- a/browser/branding/unofficial/locales/en-US/brand.dtd
+++ b/browser/branding/unofficial/locales/en-US/brand.dtd
@@ -1,9 +1,13 @@
 <!-- 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      "Nightly">
 <!ENTITY  brandShortName        "Nightly">
 <!ENTITY  brandFullName         "Nightly">
+<!-- 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      "Firefox">
 <!ENTITY  vendorShortName       "Mozilla">
 <!ENTITY  trademarkInfo.part1   " ">
--- a/browser/branding/unofficial/locales/en-US/brand.ftl
+++ b/browser/branding/unofficial/locales/en-US/brand.ftl
@@ -7,13 +7,16 @@
 ## Firefox must be treated as a brand, and kept in English.
 ## It cannot be:
 ## - Declined to adapt to grammatical case.
 ## - Transliterated.
 ## - Translated.
 ##
 ## Reference: https://www.mozilla.org/styleguide/communications/translation/
 
+-brand-shorter-name = Nightly
 -brand-short-name = Nightly
--vendor-short-name = Mozilla
 -brand-full-name = Nightly
--brand-shorter-name = Nightly
-trademarkInfo = { " " } 
+# 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 = { " " }
--- a/browser/branding/unofficial/locales/en-US/brand.properties
+++ b/browser/branding/unofficial/locales/en-US/brand.properties
@@ -1,10 +1,14 @@
 # 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=Nightly
 brandShortName=Nightly
 brandFullName=Nightly
+# 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=Firefox
 vendorShortName=Mozilla
 
 syncBrandShortName=Sync
--- a/mobile/android/branding/beta/locales/en-US/brand.dtd
+++ b/mobile/android/branding/beta/locales/en-US/brand.dtd
@@ -1,9 +1,13 @@
 <!-- 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  brandShortName  "Firefox Beta">
 <!ENTITY  brandFullName   "Mozilla Firefox Beta">
+<!-- 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 "Firefox">
 <!ENTITY  vendorShortName "Mozilla">
 
 <!ENTITY  brandPocket     "Pocket">
--- a/mobile/android/branding/beta/locales/en-US/brand.ftl
+++ b/mobile/android/branding/beta/locales/en-US/brand.ftl
@@ -9,9 +9,12 @@
 ## - Declined to adapt to grammatical case.
 ## - Transliterated.
 ## - Translated.
 ##
 ## Reference: https://www.mozilla.org/styleguide/communications/translation/
 
 -brand-short-name = Firefox Beta
 -brand-full-name = Mozilla Firefox Beta
+# 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
--- a/mobile/android/branding/beta/locales/en-US/brand.properties
+++ b/mobile/android/branding/beta/locales/en-US/brand.properties
@@ -1,6 +1,10 @@
 # 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/.
 
 brandShortName=Firefox Beta
 brandFullName=Mozilla Firefox Beta
+# 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=Firefox
--- a/mobile/android/branding/nightly/locales/en-US/brand.dtd
+++ b/mobile/android/branding/nightly/locales/en-US/brand.dtd
@@ -1,9 +1,13 @@
 <!-- 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  brandShortName  "Nightly">
 <!ENTITY  brandFullName   "Mozilla Nightly">
+<!-- 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 "Firefox">
 <!ENTITY  vendorShortName "Mozilla">
 
 <!ENTITY  brandPocket     "Pocket">
--- a/mobile/android/branding/nightly/locales/en-US/brand.ftl
+++ b/mobile/android/branding/nightly/locales/en-US/brand.ftl
@@ -9,9 +9,12 @@
 ## - Declined to adapt to grammatical case.
 ## - Transliterated.
 ## - Translated.
 ##
 ## Reference: https://www.mozilla.org/styleguide/communications/translation/
 
 -brand-short-name = Nightly
 -brand-full-name = Mozilla 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
--- a/mobile/android/branding/nightly/locales/en-US/brand.properties
+++ b/mobile/android/branding/nightly/locales/en-US/brand.properties
@@ -1,6 +1,10 @@
 # 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/.
 
 brandShortName=Nightly
 brandFullName=Mozilla Nightly
+# 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=Firefox
--- a/mobile/android/branding/official/locales/en-US/brand.dtd
+++ b/mobile/android/branding/official/locales/en-US/brand.dtd
@@ -1,9 +1,13 @@
 <!-- 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  brandShortName  "Firefox">
 <!ENTITY  brandFullName   "Mozilla Firefox">
+<!-- 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 "Firefox">
 <!ENTITY  vendorShortName "Mozilla">
 
 <!ENTITY  brandPocket     "Pocket">
--- a/mobile/android/branding/official/locales/en-US/brand.ftl
+++ b/mobile/android/branding/official/locales/en-US/brand.ftl
@@ -9,9 +9,12 @@
 ## - Declined to adapt to grammatical case.
 ## - Transliterated.
 ## - Translated.
 ##
 ## Reference: https://www.mozilla.org/styleguide/communications/translation/
 
 -brand-short-name = Firefox
 -brand-full-name = Mozilla Firefox
+# 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
--- a/mobile/android/branding/official/locales/en-US/brand.properties
+++ b/mobile/android/branding/official/locales/en-US/brand.properties
@@ -1,6 +1,10 @@
 # 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/.
 
 brandShortName=Firefox
 brandFullName=Mozilla Firefox
+# 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=Firefox
--- a/mobile/android/branding/unofficial/locales/en-US/brand.dtd
+++ b/mobile/android/branding/unofficial/locales/en-US/brand.dtd
@@ -1,9 +1,13 @@
 <!-- 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  brandShortName  "Fennec">
 <!ENTITY  brandFullName   "Mozilla Fennec">
+<!-- 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 "Firefox">
 <!ENTITY  vendorShortName "Mozilla">
 
 <!ENTITY  brandPocket     "Pocket">
--- a/mobile/android/branding/unofficial/locales/en-US/brand.ftl
+++ b/mobile/android/branding/unofficial/locales/en-US/brand.ftl
@@ -9,9 +9,12 @@
 ## - Declined to adapt to grammatical case.
 ## - Transliterated.
 ## - Translated.
 ##
 ## Reference: https://www.mozilla.org/styleguide/communications/translation/
 
 -brand-short-name = Fennec
 -brand-full-name = Mozilla Fennec
+# 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
--- a/mobile/android/branding/unofficial/locales/en-US/brand.properties
+++ b/mobile/android/branding/unofficial/locales/en-US/brand.properties
@@ -1,6 +1,10 @@
 # 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/.
 
 brandShortName=Fennec
 brandFullName=Mozilla Fennec
+# 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=Firefox