From 930298e1efff3e40721659d8fd7118cdd2477bd4 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Mon, 28 Oct 2019 19:57:37 -0400
Subject: Improve branding for version 68 ESR.

* data/branding/icecat/locales/en-US/brand.dtd: Add brandProductName.
* data/branding/icecat/locales/en-US/brand.ftl: Add
brand-shorter-name, brand-full-name, brand-product-name,
vendor-short-name, and trademarkInfo.
* data/branding/icecat/locales/en-US/brand.properties: Add
brandProductName.
* makeicecat: Limit replacement of trademarkInfo.part1 of brand.dtd
files to only be done within l10n directory.  Replace trademarkInfo of
brand.ftl files within l10n directory.
---
 data/branding/icecat/locales/en-US/brand.dtd        | 1 +
 data/branding/icecat/locales/en-US/brand.ftl        | 5 +++++
 data/branding/icecat/locales/en-US/brand.properties | 1 +
 makeicecat                                          | 3 ++-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/data/branding/icecat/locales/en-US/brand.dtd b/data/branding/icecat/locales/en-US/brand.dtd
index 3788266..475ce7d 100644
--- a/data/branding/icecat/locales/en-US/brand.dtd
+++ b/data/branding/icecat/locales/en-US/brand.dtd
@@ -5,5 +5,6 @@
 <!ENTITY  brandShorterName      "IceCat">
 <!ENTITY  brandShortName        "IceCat">
 <!ENTITY  brandFullName         "GNU IceCat">
+<!ENTITY  brandProductName      "IceCat">
 <!ENTITY  vendorShortName       "GNU">
 <!ENTITY  trademarkInfo.part1   "The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version.">
diff --git a/data/branding/icecat/locales/en-US/brand.ftl b/data/branding/icecat/locales/en-US/brand.ftl
index bd7fbe0..7c9fcc8 100644
--- a/data/branding/icecat/locales/en-US/brand.ftl
+++ b/data/branding/icecat/locales/en-US/brand.ftl
@@ -2,4 +2,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/.
 
+-brand-shorter-name = IceCat
 -brand-short-name = IceCat
+-brand-full-name = GNU IceCat
+-brand-product-name = IceCat
+-vendor-short-name = GNU
+trademarkInfo = The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version.
diff --git a/data/branding/icecat/locales/en-US/brand.properties b/data/branding/icecat/locales/en-US/brand.properties
index 85e2894..9b9cf97 100644
--- a/data/branding/icecat/locales/en-US/brand.properties
+++ b/data/branding/icecat/locales/en-US/brand.properties
@@ -5,6 +5,7 @@
 brandShorterName=IceCat
 brandShortName=IceCat
 brandFullName=IceCat
+brandProductName=IceCat
 vendorShortName=GNU
 
 syncBrandShortName=Sync
diff --git a/makeicecat b/makeicecat
index 1bcf465..3ff2ead 100755
--- a/makeicecat
+++ b/makeicecat
@@ -226,7 +226,8 @@ cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in
 
 # Custom legal about pages
 
-find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
+find l10n -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
+find l10n -wholename '*/brand.ftl' |xargs /bin/sed 's/^trademarkInfo = .*/trademarkInfo = The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version./' -i
 
 for STRING in rights.intro-point3-unbranded rights.intro-point4a-unbranded rights.intro-point4b-unbranded rights.intro-point4c-unbranded
 do
-- 
cgit v1.2.3