[torbutton/master] Bug 40011: rename tor-browser-brand.ftl to brand.ftl - tbb-commits

28 Sep 2020

commit becf9537f653105e57222652627ec3c73553d150
Author: Alex Catarineu acat@torproject.org
Date:   Thu Jun 18 14:05:52 2020 +0200
Bug 40011: rename tor-browser-brand.ftl to brand.ftl
---
 chrome/locale/af/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/ak/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/am/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/ar/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/arn/branding/{tor-browser-brand.ftl => brand.ftl}   | 0
 chrome/locale/ast/branding/{tor-browser-brand.ftl => brand.ftl}   | 0
 chrome/locale/az/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/be/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/bg/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/bn-BD/branding/{tor-browser-brand.ftl => brand.ftl} | 0
 chrome/locale/bn-IN/branding/{tor-browser-brand.ftl => brand.ftl} | 0
 chrome/locale/bn/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/bo/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/br/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/bs/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/ca/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/cs/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/csb/branding/{tor-browser-brand.ftl => brand.ftl}   | 0
 chrome/locale/cy/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/da/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/de/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/dz/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/el/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/en-US/branding/{tor-browser-brand.ftl => brand.ftl} | 0
 chrome/locale/eo/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/es-AR/branding/{tor-browser-brand.ftl => brand.ftl} | 0
 chrome/locale/es-ES/branding/{tor-browser-brand.ftl => brand.ftl} | 0
 chrome/locale/et/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/eu/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/fa/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/fi/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/fil/branding/{tor-browser-brand.ftl => brand.ftl}   | 0
 chrome/locale/fo/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/fr/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/fur/branding/{tor-browser-brand.ftl => brand.ftl}   | 0
 chrome/locale/fy/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/ga-IE/branding/{tor-browser-brand.ftl => brand.ftl} | 0
 chrome/locale/gl/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/gu/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/gun/branding/{tor-browser-brand.ftl => brand.ftl}   | 0
 chrome/locale/ha/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/he/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/hi/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/hr/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/ht/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/hu/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/hy/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/id/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/is/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/it/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/ja/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/jv/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/ka/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/km/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/kn/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/ko/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/ku/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/kw/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/ky/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/lb/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/ln/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/lo/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/lt/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/lv/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/mg/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/mi/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/mk/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/ml/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/mn/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/mr/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/ms/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/mt/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/my/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/nah/branding/{tor-browser-brand.ftl => brand.ftl}   | 0
 chrome/locale/nap/branding/{tor-browser-brand.ftl => brand.ftl}   | 0
 chrome/locale/nb-NO/branding/{tor-browser-brand.ftl => brand.ftl} | 0
 chrome/locale/ne/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/nl/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/nn/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/nso/branding/{tor-browser-brand.ftl => brand.ftl}   | 0
 chrome/locale/oc/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/or/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/pa/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/pap/branding/{tor-browser-brand.ftl => brand.ftl}   | 0
 chrome/locale/pl/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/pms/branding/{tor-browser-brand.ftl => brand.ftl}   | 0
 chrome/locale/ps/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/pt-BR/branding/{tor-browser-brand.ftl => brand.ftl} | 0
 chrome/locale/pt/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/ro/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/ru/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/sco/branding/{tor-browser-brand.ftl => brand.ftl}   | 0
 chrome/locale/sk/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/sl/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/so/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/son/branding/{tor-browser-brand.ftl => brand.ftl}   | 0
 chrome/locale/sq/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/sr/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/st/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/su/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/sv-SE/branding/{tor-browser-brand.ftl => brand.ftl} | 0
 chrome/locale/sw/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/ta/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/te/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/tg/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/th/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/ti/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/tk/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/tr/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/uk/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/ur/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/ve/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/vi/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/wa/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/wo/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 chrome/locale/zh-CN/branding/{tor-browser-brand.ftl => brand.ftl} | 0
 chrome/locale/zh-HK/branding/{tor-browser-brand.ftl => brand.ftl} | 0
 chrome/locale/zh-TW/branding/{tor-browser-brand.ftl => brand.ftl} | 0
 chrome/locale/zu/branding/{tor-browser-brand.ftl => brand.ftl}    | 0
 import-translations.sh                                            | 6 +++---
 120 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/chrome/locale/af/branding/tor-browser-brand.ftl b/chrome/locale/af/branding/brand.ftl
similarity index 100%
rename from chrome/locale/af/branding/tor-browser-brand.ftl
rename to chrome/locale/af/branding/brand.ftl
diff --git a/chrome/locale/ak/branding/tor-browser-brand.ftl b/chrome/locale/ak/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ak/branding/tor-browser-brand.ftl
rename to chrome/locale/ak/branding/brand.ftl
diff --git a/chrome/locale/am/branding/tor-browser-brand.ftl b/chrome/locale/am/branding/brand.ftl
similarity index 100%
rename from chrome/locale/am/branding/tor-browser-brand.ftl
rename to chrome/locale/am/branding/brand.ftl
diff --git a/chrome/locale/ar/branding/tor-browser-brand.ftl b/chrome/locale/ar/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ar/branding/tor-browser-brand.ftl
rename to chrome/locale/ar/branding/brand.ftl
diff --git a/chrome/locale/arn/branding/tor-browser-brand.ftl b/chrome/locale/arn/branding/brand.ftl
similarity index 100%
rename from chrome/locale/arn/branding/tor-browser-brand.ftl
rename to chrome/locale/arn/branding/brand.ftl
diff --git a/chrome/locale/ast/branding/tor-browser-brand.ftl b/chrome/locale/ast/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ast/branding/tor-browser-brand.ftl
rename to chrome/locale/ast/branding/brand.ftl
diff --git a/chrome/locale/az/branding/tor-browser-brand.ftl b/chrome/locale/az/branding/brand.ftl
similarity index 100%
rename from chrome/locale/az/branding/tor-browser-brand.ftl
rename to chrome/locale/az/branding/brand.ftl
diff --git a/chrome/locale/be/branding/tor-browser-brand.ftl b/chrome/locale/be/branding/brand.ftl
similarity index 100%
rename from chrome/locale/be/branding/tor-browser-brand.ftl
rename to chrome/locale/be/branding/brand.ftl
diff --git a/chrome/locale/bg/branding/tor-browser-brand.ftl b/chrome/locale/bg/branding/brand.ftl
similarity index 100%
rename from chrome/locale/bg/branding/tor-browser-brand.ftl
rename to chrome/locale/bg/branding/brand.ftl
diff --git a/chrome/locale/bn-BD/branding/tor-browser-brand.ftl b/chrome/locale/bn-BD/branding/brand.ftl
similarity index 100%
rename from chrome/locale/bn-BD/branding/tor-browser-brand.ftl
rename to chrome/locale/bn-BD/branding/brand.ftl
diff --git a/chrome/locale/bn-IN/branding/tor-browser-brand.ftl b/chrome/locale/bn-IN/branding/brand.ftl
similarity index 100%
rename from chrome/locale/bn-IN/branding/tor-browser-brand.ftl
rename to chrome/locale/bn-IN/branding/brand.ftl
diff --git a/chrome/locale/bn/branding/tor-browser-brand.ftl b/chrome/locale/bn/branding/brand.ftl
similarity index 100%
rename from chrome/locale/bn/branding/tor-browser-brand.ftl
rename to chrome/locale/bn/branding/brand.ftl
diff --git a/chrome/locale/bo/branding/tor-browser-brand.ftl b/chrome/locale/bo/branding/brand.ftl
similarity index 100%
rename from chrome/locale/bo/branding/tor-browser-brand.ftl
rename to chrome/locale/bo/branding/brand.ftl
diff --git a/chrome/locale/br/branding/tor-browser-brand.ftl b/chrome/locale/br/branding/brand.ftl
similarity index 100%
rename from chrome/locale/br/branding/tor-browser-brand.ftl
rename to chrome/locale/br/branding/brand.ftl
diff --git a/chrome/locale/bs/branding/tor-browser-brand.ftl b/chrome/locale/bs/branding/brand.ftl
similarity index 100%
rename from chrome/locale/bs/branding/tor-browser-brand.ftl
rename to chrome/locale/bs/branding/brand.ftl
diff --git a/chrome/locale/ca/branding/tor-browser-brand.ftl b/chrome/locale/ca/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ca/branding/tor-browser-brand.ftl
rename to chrome/locale/ca/branding/brand.ftl
diff --git a/chrome/locale/cs/branding/tor-browser-brand.ftl b/chrome/locale/cs/branding/brand.ftl
similarity index 100%
rename from chrome/locale/cs/branding/tor-browser-brand.ftl
rename to chrome/locale/cs/branding/brand.ftl
diff --git a/chrome/locale/csb/branding/tor-browser-brand.ftl b/chrome/locale/csb/branding/brand.ftl
similarity index 100%
rename from chrome/locale/csb/branding/tor-browser-brand.ftl
rename to chrome/locale/csb/branding/brand.ftl
diff --git a/chrome/locale/cy/branding/tor-browser-brand.ftl b/chrome/locale/cy/branding/brand.ftl
similarity index 100%
rename from chrome/locale/cy/branding/tor-browser-brand.ftl
rename to chrome/locale/cy/branding/brand.ftl
diff --git a/chrome/locale/da/branding/tor-browser-brand.ftl b/chrome/locale/da/branding/brand.ftl
similarity index 100%
rename from chrome/locale/da/branding/tor-browser-brand.ftl
rename to chrome/locale/da/branding/brand.ftl
diff --git a/chrome/locale/de/branding/tor-browser-brand.ftl b/chrome/locale/de/branding/brand.ftl
similarity index 100%
rename from chrome/locale/de/branding/tor-browser-brand.ftl
rename to chrome/locale/de/branding/brand.ftl
diff --git a/chrome/locale/dz/branding/tor-browser-brand.ftl b/chrome/locale/dz/branding/brand.ftl
similarity index 100%
rename from chrome/locale/dz/branding/tor-browser-brand.ftl
rename to chrome/locale/dz/branding/brand.ftl
diff --git a/chrome/locale/el/branding/tor-browser-brand.ftl b/chrome/locale/el/branding/brand.ftl
similarity index 100%
rename from chrome/locale/el/branding/tor-browser-brand.ftl
rename to chrome/locale/el/branding/brand.ftl
diff --git a/chrome/locale/en-US/branding/tor-browser-brand.ftl b/chrome/locale/en-US/branding/brand.ftl
similarity index 100%
rename from chrome/locale/en-US/branding/tor-browser-brand.ftl
rename to chrome/locale/en-US/branding/brand.ftl
diff --git a/chrome/locale/eo/branding/tor-browser-brand.ftl b/chrome/locale/eo/branding/brand.ftl
similarity index 100%
rename from chrome/locale/eo/branding/tor-browser-brand.ftl
rename to chrome/locale/eo/branding/brand.ftl
diff --git a/chrome/locale/es-AR/branding/tor-browser-brand.ftl b/chrome/locale/es-AR/branding/brand.ftl
similarity index 100%
rename from chrome/locale/es-AR/branding/tor-browser-brand.ftl
rename to chrome/locale/es-AR/branding/brand.ftl
diff --git a/chrome/locale/es-ES/branding/tor-browser-brand.ftl b/chrome/locale/es-ES/branding/brand.ftl
similarity index 100%
rename from chrome/locale/es-ES/branding/tor-browser-brand.ftl
rename to chrome/locale/es-ES/branding/brand.ftl
diff --git a/chrome/locale/et/branding/tor-browser-brand.ftl b/chrome/locale/et/branding/brand.ftl
similarity index 100%
rename from chrome/locale/et/branding/tor-browser-brand.ftl
rename to chrome/locale/et/branding/brand.ftl
diff --git a/chrome/locale/eu/branding/tor-browser-brand.ftl b/chrome/locale/eu/branding/brand.ftl
similarity index 100%
rename from chrome/locale/eu/branding/tor-browser-brand.ftl
rename to chrome/locale/eu/branding/brand.ftl
diff --git a/chrome/locale/fa/branding/tor-browser-brand.ftl b/chrome/locale/fa/branding/brand.ftl
similarity index 100%
rename from chrome/locale/fa/branding/tor-browser-brand.ftl
rename to chrome/locale/fa/branding/brand.ftl
diff --git a/chrome/locale/fi/branding/tor-browser-brand.ftl b/chrome/locale/fi/branding/brand.ftl
similarity index 100%
rename from chrome/locale/fi/branding/tor-browser-brand.ftl
rename to chrome/locale/fi/branding/brand.ftl
diff --git a/chrome/locale/fil/branding/tor-browser-brand.ftl b/chrome/locale/fil/branding/brand.ftl
similarity index 100%
rename from chrome/locale/fil/branding/tor-browser-brand.ftl
rename to chrome/locale/fil/branding/brand.ftl
diff --git a/chrome/locale/fo/branding/tor-browser-brand.ftl b/chrome/locale/fo/branding/brand.ftl
similarity index 100%
rename from chrome/locale/fo/branding/tor-browser-brand.ftl
rename to chrome/locale/fo/branding/brand.ftl
diff --git a/chrome/locale/fr/branding/tor-browser-brand.ftl b/chrome/locale/fr/branding/brand.ftl
similarity index 100%
rename from chrome/locale/fr/branding/tor-browser-brand.ftl
rename to chrome/locale/fr/branding/brand.ftl
diff --git a/chrome/locale/fur/branding/tor-browser-brand.ftl b/chrome/locale/fur/branding/brand.ftl
similarity index 100%
rename from chrome/locale/fur/branding/tor-browser-brand.ftl
rename to chrome/locale/fur/branding/brand.ftl
diff --git a/chrome/locale/fy/branding/tor-browser-brand.ftl b/chrome/locale/fy/branding/brand.ftl
similarity index 100%
rename from chrome/locale/fy/branding/tor-browser-brand.ftl
rename to chrome/locale/fy/branding/brand.ftl
diff --git a/chrome/locale/ga-IE/branding/tor-browser-brand.ftl b/chrome/locale/ga-IE/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ga-IE/branding/tor-browser-brand.ftl
rename to chrome/locale/ga-IE/branding/brand.ftl
diff --git a/chrome/locale/gl/branding/tor-browser-brand.ftl b/chrome/locale/gl/branding/brand.ftl
similarity index 100%
rename from chrome/locale/gl/branding/tor-browser-brand.ftl
rename to chrome/locale/gl/branding/brand.ftl
diff --git a/chrome/locale/gu/branding/tor-browser-brand.ftl b/chrome/locale/gu/branding/brand.ftl
similarity index 100%
rename from chrome/locale/gu/branding/tor-browser-brand.ftl
rename to chrome/locale/gu/branding/brand.ftl
diff --git a/chrome/locale/gun/branding/tor-browser-brand.ftl b/chrome/locale/gun/branding/brand.ftl
similarity index 100%
rename from chrome/locale/gun/branding/tor-browser-brand.ftl
rename to chrome/locale/gun/branding/brand.ftl
diff --git a/chrome/locale/ha/branding/tor-browser-brand.ftl b/chrome/locale/ha/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ha/branding/tor-browser-brand.ftl
rename to chrome/locale/ha/branding/brand.ftl
diff --git a/chrome/locale/he/branding/tor-browser-brand.ftl b/chrome/locale/he/branding/brand.ftl
similarity index 100%
rename from chrome/locale/he/branding/tor-browser-brand.ftl
rename to chrome/locale/he/branding/brand.ftl
diff --git a/chrome/locale/hi/branding/tor-browser-brand.ftl b/chrome/locale/hi/branding/brand.ftl
similarity index 100%
rename from chrome/locale/hi/branding/tor-browser-brand.ftl
rename to chrome/locale/hi/branding/brand.ftl
diff --git a/chrome/locale/hr/branding/tor-browser-brand.ftl b/chrome/locale/hr/branding/brand.ftl
similarity index 100%
rename from chrome/locale/hr/branding/tor-browser-brand.ftl
rename to chrome/locale/hr/branding/brand.ftl
diff --git a/chrome/locale/ht/branding/tor-browser-brand.ftl b/chrome/locale/ht/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ht/branding/tor-browser-brand.ftl
rename to chrome/locale/ht/branding/brand.ftl
diff --git a/chrome/locale/hu/branding/tor-browser-brand.ftl b/chrome/locale/hu/branding/brand.ftl
similarity index 100%
rename from chrome/locale/hu/branding/tor-browser-brand.ftl
rename to chrome/locale/hu/branding/brand.ftl
diff --git a/chrome/locale/hy/branding/tor-browser-brand.ftl b/chrome/locale/hy/branding/brand.ftl
similarity index 100%
rename from chrome/locale/hy/branding/tor-browser-brand.ftl
rename to chrome/locale/hy/branding/brand.ftl
diff --git a/chrome/locale/id/branding/tor-browser-brand.ftl b/chrome/locale/id/branding/brand.ftl
similarity index 100%
rename from chrome/locale/id/branding/tor-browser-brand.ftl
rename to chrome/locale/id/branding/brand.ftl
diff --git a/chrome/locale/is/branding/tor-browser-brand.ftl b/chrome/locale/is/branding/brand.ftl
similarity index 100%
rename from chrome/locale/is/branding/tor-browser-brand.ftl
rename to chrome/locale/is/branding/brand.ftl
diff --git a/chrome/locale/it/branding/tor-browser-brand.ftl b/chrome/locale/it/branding/brand.ftl
similarity index 100%
rename from chrome/locale/it/branding/tor-browser-brand.ftl
rename to chrome/locale/it/branding/brand.ftl
diff --git a/chrome/locale/ja/branding/tor-browser-brand.ftl b/chrome/locale/ja/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ja/branding/tor-browser-brand.ftl
rename to chrome/locale/ja/branding/brand.ftl
diff --git a/chrome/locale/jv/branding/tor-browser-brand.ftl b/chrome/locale/jv/branding/brand.ftl
similarity index 100%
rename from chrome/locale/jv/branding/tor-browser-brand.ftl
rename to chrome/locale/jv/branding/brand.ftl
diff --git a/chrome/locale/ka/branding/tor-browser-brand.ftl b/chrome/locale/ka/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ka/branding/tor-browser-brand.ftl
rename to chrome/locale/ka/branding/brand.ftl
diff --git a/chrome/locale/km/branding/tor-browser-brand.ftl b/chrome/locale/km/branding/brand.ftl
similarity index 100%
rename from chrome/locale/km/branding/tor-browser-brand.ftl
rename to chrome/locale/km/branding/brand.ftl
diff --git a/chrome/locale/kn/branding/tor-browser-brand.ftl b/chrome/locale/kn/branding/brand.ftl
similarity index 100%
rename from chrome/locale/kn/branding/tor-browser-brand.ftl
rename to chrome/locale/kn/branding/brand.ftl
diff --git a/chrome/locale/ko/branding/tor-browser-brand.ftl b/chrome/locale/ko/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ko/branding/tor-browser-brand.ftl
rename to chrome/locale/ko/branding/brand.ftl
diff --git a/chrome/locale/ku/branding/tor-browser-brand.ftl b/chrome/locale/ku/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ku/branding/tor-browser-brand.ftl
rename to chrome/locale/ku/branding/brand.ftl
diff --git a/chrome/locale/kw/branding/tor-browser-brand.ftl b/chrome/locale/kw/branding/brand.ftl
similarity index 100%
rename from chrome/locale/kw/branding/tor-browser-brand.ftl
rename to chrome/locale/kw/branding/brand.ftl
diff --git a/chrome/locale/ky/branding/tor-browser-brand.ftl b/chrome/locale/ky/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ky/branding/tor-browser-brand.ftl
rename to chrome/locale/ky/branding/brand.ftl
diff --git a/chrome/locale/lb/branding/tor-browser-brand.ftl b/chrome/locale/lb/branding/brand.ftl
similarity index 100%
rename from chrome/locale/lb/branding/tor-browser-brand.ftl
rename to chrome/locale/lb/branding/brand.ftl
diff --git a/chrome/locale/ln/branding/tor-browser-brand.ftl b/chrome/locale/ln/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ln/branding/tor-browser-brand.ftl
rename to chrome/locale/ln/branding/brand.ftl
diff --git a/chrome/locale/lo/branding/tor-browser-brand.ftl b/chrome/locale/lo/branding/brand.ftl
similarity index 100%
rename from chrome/locale/lo/branding/tor-browser-brand.ftl
rename to chrome/locale/lo/branding/brand.ftl
diff --git a/chrome/locale/lt/branding/tor-browser-brand.ftl b/chrome/locale/lt/branding/brand.ftl
similarity index 100%
rename from chrome/locale/lt/branding/tor-browser-brand.ftl
rename to chrome/locale/lt/branding/brand.ftl
diff --git a/chrome/locale/lv/branding/tor-browser-brand.ftl b/chrome/locale/lv/branding/brand.ftl
similarity index 100%
rename from chrome/locale/lv/branding/tor-browser-brand.ftl
rename to chrome/locale/lv/branding/brand.ftl
diff --git a/chrome/locale/mg/branding/tor-browser-brand.ftl b/chrome/locale/mg/branding/brand.ftl
similarity index 100%
rename from chrome/locale/mg/branding/tor-browser-brand.ftl
rename to chrome/locale/mg/branding/brand.ftl
diff --git a/chrome/locale/mi/branding/tor-browser-brand.ftl b/chrome/locale/mi/branding/brand.ftl
similarity index 100%
rename from chrome/locale/mi/branding/tor-browser-brand.ftl
rename to chrome/locale/mi/branding/brand.ftl
diff --git a/chrome/locale/mk/branding/tor-browser-brand.ftl b/chrome/locale/mk/branding/brand.ftl
similarity index 100%
rename from chrome/locale/mk/branding/tor-browser-brand.ftl
rename to chrome/locale/mk/branding/brand.ftl
diff --git a/chrome/locale/ml/branding/tor-browser-brand.ftl b/chrome/locale/ml/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ml/branding/tor-browser-brand.ftl
rename to chrome/locale/ml/branding/brand.ftl
diff --git a/chrome/locale/mn/branding/tor-browser-brand.ftl b/chrome/locale/mn/branding/brand.ftl
similarity index 100%
rename from chrome/locale/mn/branding/tor-browser-brand.ftl
rename to chrome/locale/mn/branding/brand.ftl
diff --git a/chrome/locale/mr/branding/tor-browser-brand.ftl b/chrome/locale/mr/branding/brand.ftl
similarity index 100%
rename from chrome/locale/mr/branding/tor-browser-brand.ftl
rename to chrome/locale/mr/branding/brand.ftl
diff --git a/chrome/locale/ms/branding/tor-browser-brand.ftl b/chrome/locale/ms/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ms/branding/tor-browser-brand.ftl
rename to chrome/locale/ms/branding/brand.ftl
diff --git a/chrome/locale/mt/branding/tor-browser-brand.ftl b/chrome/locale/mt/branding/brand.ftl
similarity index 100%
rename from chrome/locale/mt/branding/tor-browser-brand.ftl
rename to chrome/locale/mt/branding/brand.ftl
diff --git a/chrome/locale/my/branding/tor-browser-brand.ftl b/chrome/locale/my/branding/brand.ftl
similarity index 100%
rename from chrome/locale/my/branding/tor-browser-brand.ftl
rename to chrome/locale/my/branding/brand.ftl
diff --git a/chrome/locale/nah/branding/tor-browser-brand.ftl b/chrome/locale/nah/branding/brand.ftl
similarity index 100%
rename from chrome/locale/nah/branding/tor-browser-brand.ftl
rename to chrome/locale/nah/branding/brand.ftl
diff --git a/chrome/locale/nap/branding/tor-browser-brand.ftl b/chrome/locale/nap/branding/brand.ftl
similarity index 100%
rename from chrome/locale/nap/branding/tor-browser-brand.ftl
rename to chrome/locale/nap/branding/brand.ftl
diff --git a/chrome/locale/nb-NO/branding/tor-browser-brand.ftl b/chrome/locale/nb-NO/branding/brand.ftl
similarity index 100%
rename from chrome/locale/nb-NO/branding/tor-browser-brand.ftl
rename to chrome/locale/nb-NO/branding/brand.ftl
diff --git a/chrome/locale/ne/branding/tor-browser-brand.ftl b/chrome/locale/ne/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ne/branding/tor-browser-brand.ftl
rename to chrome/locale/ne/branding/brand.ftl
diff --git a/chrome/locale/nl/branding/tor-browser-brand.ftl b/chrome/locale/nl/branding/brand.ftl
similarity index 100%
rename from chrome/locale/nl/branding/tor-browser-brand.ftl
rename to chrome/locale/nl/branding/brand.ftl
diff --git a/chrome/locale/nn/branding/tor-browser-brand.ftl b/chrome/locale/nn/branding/brand.ftl
similarity index 100%
rename from chrome/locale/nn/branding/tor-browser-brand.ftl
rename to chrome/locale/nn/branding/brand.ftl
diff --git a/chrome/locale/nso/branding/tor-browser-brand.ftl b/chrome/locale/nso/branding/brand.ftl
similarity index 100%
rename from chrome/locale/nso/branding/tor-browser-brand.ftl
rename to chrome/locale/nso/branding/brand.ftl
diff --git a/chrome/locale/oc/branding/tor-browser-brand.ftl b/chrome/locale/oc/branding/brand.ftl
similarity index 100%
rename from chrome/locale/oc/branding/tor-browser-brand.ftl
rename to chrome/locale/oc/branding/brand.ftl
diff --git a/chrome/locale/or/branding/tor-browser-brand.ftl b/chrome/locale/or/branding/brand.ftl
similarity index 100%
rename from chrome/locale/or/branding/tor-browser-brand.ftl
rename to chrome/locale/or/branding/brand.ftl
diff --git a/chrome/locale/pa/branding/tor-browser-brand.ftl b/chrome/locale/pa/branding/brand.ftl
similarity index 100%
rename from chrome/locale/pa/branding/tor-browser-brand.ftl
rename to chrome/locale/pa/branding/brand.ftl
diff --git a/chrome/locale/pap/branding/tor-browser-brand.ftl b/chrome/locale/pap/branding/brand.ftl
similarity index 100%
rename from chrome/locale/pap/branding/tor-browser-brand.ftl
rename to chrome/locale/pap/branding/brand.ftl
diff --git a/chrome/locale/pl/branding/tor-browser-brand.ftl b/chrome/locale/pl/branding/brand.ftl
similarity index 100%
rename from chrome/locale/pl/branding/tor-browser-brand.ftl
rename to chrome/locale/pl/branding/brand.ftl
diff --git a/chrome/locale/pms/branding/tor-browser-brand.ftl b/chrome/locale/pms/branding/brand.ftl
similarity index 100%
rename from chrome/locale/pms/branding/tor-browser-brand.ftl
rename to chrome/locale/pms/branding/brand.ftl
diff --git a/chrome/locale/ps/branding/tor-browser-brand.ftl b/chrome/locale/ps/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ps/branding/tor-browser-brand.ftl
rename to chrome/locale/ps/branding/brand.ftl
diff --git a/chrome/locale/pt-BR/branding/tor-browser-brand.ftl b/chrome/locale/pt-BR/branding/brand.ftl
similarity index 100%
rename from chrome/locale/pt-BR/branding/tor-browser-brand.ftl
rename to chrome/locale/pt-BR/branding/brand.ftl
diff --git a/chrome/locale/pt/branding/tor-browser-brand.ftl b/chrome/locale/pt/branding/brand.ftl
similarity index 100%
rename from chrome/locale/pt/branding/tor-browser-brand.ftl
rename to chrome/locale/pt/branding/brand.ftl
diff --git a/chrome/locale/ro/branding/tor-browser-brand.ftl b/chrome/locale/ro/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ro/branding/tor-browser-brand.ftl
rename to chrome/locale/ro/branding/brand.ftl
diff --git a/chrome/locale/ru/branding/tor-browser-brand.ftl b/chrome/locale/ru/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ru/branding/tor-browser-brand.ftl
rename to chrome/locale/ru/branding/brand.ftl
diff --git a/chrome/locale/sco/branding/tor-browser-brand.ftl b/chrome/locale/sco/branding/brand.ftl
similarity index 100%
rename from chrome/locale/sco/branding/tor-browser-brand.ftl
rename to chrome/locale/sco/branding/brand.ftl
diff --git a/chrome/locale/sk/branding/tor-browser-brand.ftl b/chrome/locale/sk/branding/brand.ftl
similarity index 100%
rename from chrome/locale/sk/branding/tor-browser-brand.ftl
rename to chrome/locale/sk/branding/brand.ftl
diff --git a/chrome/locale/sl/branding/tor-browser-brand.ftl b/chrome/locale/sl/branding/brand.ftl
similarity index 100%
rename from chrome/locale/sl/branding/tor-browser-brand.ftl
rename to chrome/locale/sl/branding/brand.ftl
diff --git a/chrome/locale/so/branding/tor-browser-brand.ftl b/chrome/locale/so/branding/brand.ftl
similarity index 100%
rename from chrome/locale/so/branding/tor-browser-brand.ftl
rename to chrome/locale/so/branding/brand.ftl
diff --git a/chrome/locale/son/branding/tor-browser-brand.ftl b/chrome/locale/son/branding/brand.ftl
similarity index 100%
rename from chrome/locale/son/branding/tor-browser-brand.ftl
rename to chrome/locale/son/branding/brand.ftl
diff --git a/chrome/locale/sq/branding/tor-browser-brand.ftl b/chrome/locale/sq/branding/brand.ftl
similarity index 100%
rename from chrome/locale/sq/branding/tor-browser-brand.ftl
rename to chrome/locale/sq/branding/brand.ftl
diff --git a/chrome/locale/sr/branding/tor-browser-brand.ftl b/chrome/locale/sr/branding/brand.ftl
similarity index 100%
rename from chrome/locale/sr/branding/tor-browser-brand.ftl
rename to chrome/locale/sr/branding/brand.ftl
diff --git a/chrome/locale/st/branding/tor-browser-brand.ftl b/chrome/locale/st/branding/brand.ftl
similarity index 100%
rename from chrome/locale/st/branding/tor-browser-brand.ftl
rename to chrome/locale/st/branding/brand.ftl
diff --git a/chrome/locale/su/branding/tor-browser-brand.ftl b/chrome/locale/su/branding/brand.ftl
similarity index 100%
rename from chrome/locale/su/branding/tor-browser-brand.ftl
rename to chrome/locale/su/branding/brand.ftl
diff --git a/chrome/locale/sv-SE/branding/tor-browser-brand.ftl b/chrome/locale/sv-SE/branding/brand.ftl
similarity index 100%
rename from chrome/locale/sv-SE/branding/tor-browser-brand.ftl
rename to chrome/locale/sv-SE/branding/brand.ftl
diff --git a/chrome/locale/sw/branding/tor-browser-brand.ftl b/chrome/locale/sw/branding/brand.ftl
similarity index 100%
rename from chrome/locale/sw/branding/tor-browser-brand.ftl
rename to chrome/locale/sw/branding/brand.ftl
diff --git a/chrome/locale/ta/branding/tor-browser-brand.ftl b/chrome/locale/ta/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ta/branding/tor-browser-brand.ftl
rename to chrome/locale/ta/branding/brand.ftl
diff --git a/chrome/locale/te/branding/tor-browser-brand.ftl b/chrome/locale/te/branding/brand.ftl
similarity index 100%
rename from chrome/locale/te/branding/tor-browser-brand.ftl
rename to chrome/locale/te/branding/brand.ftl
diff --git a/chrome/locale/tg/branding/tor-browser-brand.ftl b/chrome/locale/tg/branding/brand.ftl
similarity index 100%
rename from chrome/locale/tg/branding/tor-browser-brand.ftl
rename to chrome/locale/tg/branding/brand.ftl
diff --git a/chrome/locale/th/branding/tor-browser-brand.ftl b/chrome/locale/th/branding/brand.ftl
similarity index 100%
rename from chrome/locale/th/branding/tor-browser-brand.ftl
rename to chrome/locale/th/branding/brand.ftl
diff --git a/chrome/locale/ti/branding/tor-browser-brand.ftl b/chrome/locale/ti/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ti/branding/tor-browser-brand.ftl
rename to chrome/locale/ti/branding/brand.ftl
diff --git a/chrome/locale/tk/branding/tor-browser-brand.ftl b/chrome/locale/tk/branding/brand.ftl
similarity index 100%
rename from chrome/locale/tk/branding/tor-browser-brand.ftl
rename to chrome/locale/tk/branding/brand.ftl
diff --git a/chrome/locale/tr/branding/tor-browser-brand.ftl b/chrome/locale/tr/branding/brand.ftl
similarity index 100%
rename from chrome/locale/tr/branding/tor-browser-brand.ftl
rename to chrome/locale/tr/branding/brand.ftl
diff --git a/chrome/locale/uk/branding/tor-browser-brand.ftl b/chrome/locale/uk/branding/brand.ftl
similarity index 100%
rename from chrome/locale/uk/branding/tor-browser-brand.ftl
rename to chrome/locale/uk/branding/brand.ftl
diff --git a/chrome/locale/ur/branding/tor-browser-brand.ftl b/chrome/locale/ur/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ur/branding/tor-browser-brand.ftl
rename to chrome/locale/ur/branding/brand.ftl
diff --git a/chrome/locale/ve/branding/tor-browser-brand.ftl b/chrome/locale/ve/branding/brand.ftl
similarity index 100%
rename from chrome/locale/ve/branding/tor-browser-brand.ftl
rename to chrome/locale/ve/branding/brand.ftl
diff --git a/chrome/locale/vi/branding/tor-browser-brand.ftl b/chrome/locale/vi/branding/brand.ftl
similarity index 100%
rename from chrome/locale/vi/branding/tor-browser-brand.ftl
rename to chrome/locale/vi/branding/brand.ftl
diff --git a/chrome/locale/wa/branding/tor-browser-brand.ftl b/chrome/locale/wa/branding/brand.ftl
similarity index 100%
rename from chrome/locale/wa/branding/tor-browser-brand.ftl
rename to chrome/locale/wa/branding/brand.ftl
diff --git a/chrome/locale/wo/branding/tor-browser-brand.ftl b/chrome/locale/wo/branding/brand.ftl
similarity index 100%
rename from chrome/locale/wo/branding/tor-browser-brand.ftl
rename to chrome/locale/wo/branding/brand.ftl
diff --git a/chrome/locale/zh-CN/branding/tor-browser-brand.ftl b/chrome/locale/zh-CN/branding/brand.ftl
similarity index 100%
rename from chrome/locale/zh-CN/branding/tor-browser-brand.ftl
rename to chrome/locale/zh-CN/branding/brand.ftl
diff --git a/chrome/locale/zh-HK/branding/tor-browser-brand.ftl b/chrome/locale/zh-HK/branding/brand.ftl
similarity index 100%
rename from chrome/locale/zh-HK/branding/tor-browser-brand.ftl
rename to chrome/locale/zh-HK/branding/brand.ftl
diff --git a/chrome/locale/zh-TW/branding/tor-browser-brand.ftl b/chrome/locale/zh-TW/branding/brand.ftl
similarity index 100%
rename from chrome/locale/zh-TW/branding/tor-browser-brand.ftl
rename to chrome/locale/zh-TW/branding/brand.ftl
diff --git a/chrome/locale/zu/branding/tor-browser-brand.ftl b/chrome/locale/zu/branding/brand.ftl
similarity index 100%
rename from chrome/locale/zu/branding/tor-browser-brand.ftl
rename to chrome/locale/zu/branding/brand.ftl
diff --git a/import-translations.sh b/import-translations.sh
index 78b4b8b9..f2b0fd86 100755
--- a/import-translations.sh
+++ b/import-translations.sh
@@ -90,14 +90,14 @@ for KEYVAL in "${FILEMAP[@]}"; do
 done
 )
-# Autogenerate tor-browser-brand.ftl based on brand.properties
+# Autogenerate brand.ftl based on brand.properties
 # and brand.dtd.
 REGEX_ENTITY='<!ENTITY +([^" ]+) +"(.+)">';
 for LOCALE in $BUNDLE_LOCALES;
 do
   BRAND_PATH="$LOCALE_DIR/$LOCALE/brand.properties"
   BRAND_DTD_PATH="$LOCALE_DIR/$LOCALE/brand.dtd"
-  TOR_BRAND_PATH="$(dirname "$BRAND_PATH")/branding/tor-browser-brand.ftl"
+  TOR_BRAND_PATH="$(dirname "$BRAND_PATH")/branding/brand.ftl"
BRAND_SHORTER_NAME="$(sed -n -e '/^brandShorterName/p' $BRAND_PATH | cut -d= -f2)"
   BRAND_SHORT_NAME="$(sed -n -e '/^brandShortName/p' $BRAND_PATH | cut -d= -f2)"
@@ -107,7 +107,7 @@ do
   TRADEMARK_INFO='{ " " }'
   if [[ "$(sed -n -e '/trademarkInfo/p' $BRAND_DTD_PATH)" =~ $REGEX_ENTITY ]]
   then
-    # Replace some HTML entities (now just &quot;) for tor-browser-brand.ftl.
+    # Replace some HTML entities (now just &quot;) for brand.ftl.
     TRADEMARK_INFO="${BASH_REMATCH[2]//&quot;/'}"
   fi

    