- tbb-commits - lists.torproject.org

[torbutton/master] Bug 40011: rename tor-browser-brand.ftl to brand.ftl
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit becf9537f653105e57222652627ec3c73553d150 Author: Alex Catarineu <acat(a)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 ") for tor-browser-brand.ftl. + # Replace some HTML entities (now just ") for brand.ftl. TRADEMARK_INFO="${BASH_REMATCH[2]//"/\'}" fi

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 2 commits: Bug 40059: Use MOZ_BUILD_DATE for versionCode
by Georg Koppen 28 Sep '20

28 Sep '20

Georg Koppen pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: c8fea7b4 by Georg Koppen at 2020-09-25T14:30:34+00:00 Bug 40059: Use MOZ_BUILD_DATE for versionCode At the same time we adapt MOZ_BUILD_DATE to our needs where it is actually used and not in tor-browser-build. This gives us more flexibility. See: tor-browser-build#40084. - - - - - 0a4fbe8a by Georg Koppen at 2020-09-28T13:43:59+00:00 Merge branch 'bug_40059' into tor-browser-81.1.1-10.0-1 - - - - - 2 changed files: - app/build.gradle - buildSrc/src/main/java/Config.kt Changes: ===================================== app/build.gradle ===================================== @@ -679,9 +679,12 @@ ext.updateExtensionVersion = { task, extDir -> into extDir def systemEnvBuildDate = System.getenv('MOZ_BUILD_DATE') + // MOZ_BUILD_DATE is in the YYYYMMDDHHMMSS format. Thus, we only use a + // substring of it if it is available. def values = ['version': AndroidComponents.VERSION + "." + - (systemEnvBuildDate != null ? systemEnvBuildDate : - new Date().format('MMddHHmmss'))] + (systemEnvBuildDate != null ? + systemEnvBuildDate.substring(4) : + new Date().format('MMddHHmmss'))] inputs.properties(values) expand(values) } ===================================== buildSrc/src/main/java/Config.kt ===================================== @@ -47,7 +47,7 @@ object Config { private val fennecBaseVersionCode by lazy { val format = SimpleDateFormat("YYYYMMDDHHMMSS", Locale.US) val cutoff = format.parse("20150801000000") - val build = Date() + val build = if (System.getenv("MOZ_BUILD_DATE") != null) format.parse(System.getenv("MOZ_BUILD_DATE")) else Date() Math.floor((build.time - cutoff.time) / (1000.0 * 60.0 * 60.0)).toInt() } View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/8b0f722ffcc6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/8b0f722ffcc6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/master] Bug 34163: Fix versionCode for testbuilds
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit 691a762b633c16cd7ee00b32f2284cf1bb3e9278 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 25 13:41:53 2020 +0000 Bug 34163: Fix versionCode for testbuilds --- projects/common/get-moz-build-date | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/common/get-moz-build-date b/projects/common/get-moz-build-date index a43f2f7..5932a6f 100755 --- a/projects/common/get-moz-build-date +++ b/projects/common/get-moz-build-date @@ -10,8 +10,9 @@ if ($version =~ m/^tbb-nightly\.([^\.]+)\.([^\.]+)\.([^\.]+)$/) { $date = sprintf("%d%02d%02d010101", $1, $2, $3); } elsif ($version eq 'testbuild') { # There is no need for an increasing build date in test builds. Just hardcode - # it. - $date = 20010101010101; + # it to a value that is compatible with the v1 versionCode scheme on Android, + # see: #34163. + $date = 20150801000000; } else { my @v = split(/[\.ab]/, $version); push @v, '0' if @v < 4;

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gitlab/merge-requests/80' into master
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit b13fc9ac83e49d833dee28621af182e038ad2331 Merge: f879dec f733e4f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 28 13:45:19 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/80' into master projects/common/get-moz-build-date | 5 +++-- projects/fenix/build | 3 --- 2 files changed, 3 insertions(+), 5 deletions(-)

1 0

[tor-browser-build/master] Bug 40084: Fix AndroidManifest.xml reproducibility
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit f733e4ff08d2f56ca3cf562d006e5c712b4118a8 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 25 14:25:40 2020 +0000 Bug 40084: Fix AndroidManifest.xml reproducibility We need to make sure we just set MOZ_BUILD_DATE and adapt the format where it is actually needed. See: fenix#40059 for the Fenix part that makes use of that to fix #40084. --- projects/fenix/build | 3 --- 1 file changed, 3 deletions(-) diff --git a/projects/fenix/build b/projects/fenix/build index 7569250..eedddcc 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -54,9 +54,6 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ then echo "MOZ_BUILD_DATE is not set" exit 1 - else - # We only need a MMddHHmmss format and thus no year. - MOZ_BUILD_DATE=${MOZ_BUILD_DATE:4} fi $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint

1 0

[tor-browser-build/master] Fold in 10.0 Changelog
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit f879decd41ec0f289edb0ae3188f7a117188315e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 28 13:29:10 2020 +0000 Fold in 10.0 Changelog --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 114 +++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9798767..9f66e55 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -15,6 +15,120 @@ Tor Browser 10.5a1 -- September 22 2020 * Bug 40041: Remove CentOS 6 support for 10.5 series [tor-browser-build] * Bug 40103: Add i386 pkg-config path for linux-i686 [tor-browser-build] +Tor Browser 10.0 -- September 22 2020 + * Windows + OS X + Linux + * Update Firefox to 78.3.0esr + * Update Tor to 0.4.4.5 + * Update Tor Launcher to 0.2.25 + * Bug 32174: Replace XUL <textbox> with <html:input> + * Bug 33890: Rename XUL files to XHTML + * Bug 33862: Fix usages of createTransport API + * Bug 33906: Fix Tor-Launcher issues for Firefox 75 + * Bug 33998: Use CSS grid instead of XUL grid + * Bug 34164: Tor Launcher deadlocks during startup (Firefox 77) + * Bug 34206: Tor Launcher button labels are missing (Firefox 76) + * Bug 40002: After rebasing to 80.0b2 moat is broken [tor-launcher] + * Translations update + * Update NoScript to 11.0.44 + * Bug 40093: Youtube videos on safer produce an error [tor-browser] + * Translations update + * Bug 10394: Let Tor Browser update HTTPS Everywhere + * Bug 11154: Disable TLS 1.0 (and 1.1) by default + * Bug 16931: Sanitize the add-on blocklist update URL + * Bug 17374: Disable 1024-DH Encryption by default + * Bug 21601: Remove unused media.webaudio.enabled pref + * Bug 30682: Disable Intermediate CA Preloading + * Bug 30812: Exempt about: pages from Resist Fingerprinting + * Bug 31918+33533+40024+40037: Rebase Tor Browser esr68 patches for ESR 78 [tor-browser] + * Bug 32612: Update MAR_CHANNEL_ID for the alpha + * Bug 32886: Separate treatment of @media interaction features for desktop and android + * Bug 33534: Review FF release notes from FF69 to latest (FF78) + * Bug 33697: Use old search config based on list.json + * Bug 33721: PDF Viewer is not working in the safest security level + * Bug 33734: Set MOZ_NORMANDY to False + * Bug 33737: Fix aboutDialog.js error for Firefox nightlies + * Bug 33848: Disable Enhanced Tracking Protection + * Bug 33851: Patch out Parental Controls detection and logging + * Bug 33852: Clean up about:logins to not mention Sync + * Bug 33856: Set browser.privatebrowsing.forceMediaMemoryCache to True + * Bug 33862: Fix usages of createTransport API + * Bug 33867: Disable password manager and password generation + * Bug 33890: Rename XUL files to XHTML + * Bug 33892: Add brandProductName to brand.dtd and brand.properties + * Bug 33962: Uplift patch for bug 5741 (dns leak protection) + * Bug 34125: API change in protocolProxyService.registerChannelFilter + * Bug 40001: Generate tor-browser-brand.ftl when importing translations [torbutton] + * Bug 40002: Remove about:pioneer [tor-browser] + * Bug 40002: Fix generateNSGetFactory being moved to ComponentUtils [torbutton] + * Bug 40003: Adapt code for L10nRegistry API changes [torbutton] + * Bug 40005: Initialize the identity UI before setting up the circuit display [torbutton] + * Bug 40006: Fix new identity for 81 [torbutton] + * Bug 40007: Move SecurityPrefs initialization to the StartupObserver component [torbutton] + * Bug 40008: Style fixes for 78 [torbutton] + * Bug 40016: Update Snowflake to discover NAT type [tor-browser-build] + * Bug 40017: Audit Firefox 68-78 diff for proxy issues [tor-browser] + * Bug 40022: Update new icons in Tor Browser branding [tor-browser] + * Bug 40025: Revert add-on permissions due to Mozilla's 1560059 [tor-browser] + * Bug 40036: Remove product version/update channel from #13379 patch [tor-browser] + * Bug 40038: Review RemoteSettings for ESR 78 [tor-browser] + * Bug 40048: Disable various ESR78 features via prefs [tor-browser] + * Bug 40059: Verify our external helper patch is still working [tor-browser] + * Bug 40066: Update existing prefs for ESR 78 [tor-browser] + * Bug 40066: Remove default bridge 37.218.240.34 [tor-browser-build] + * Bug 40073: Disable remote Public Suffix List fetching [tor-browser] + * Bug 40073: Repack omni.ja to include builtin HTTPS Everywhere [tor-browser-build] + * Bug 40078: Backport patches for bug 1651680 for now [tor-browser] + * Bug 40082: Let JavaScript on safest setting handled by NoScript again [tor-browser] + * Bug 40088: Moat "Submit" button does not work + * Bug 40090: Disable v3 add-on blocklist for now [tor-browser] + * Bug 40091: Load HTTPS Everywhere as a builtin addon [tor-browser] + * Bug 40102: Fix UI bugs in Tor Browser 10.0 alpha [tor-browser] + * Bug 40106: Cannot install addons in full screen mode [tor-browser] + * Bug 40109: Playing video breaks after reloading pages [tor-browser] + * Bug 40119: Enable v3 extension blocklisting again [tor-browser] + * Windows + * Bug 33855: Don't use site's icon as window icon in Windows in private mode + * Bug 40061: Omit the Windows default browser agent from the build [tor-browser] + * OS X + * Bug 32252: Tor Browser does not display correctly in VMWare Fusion on macOS (mojave) + * Build System + * Windows + OS X + Linux + * Bump Go to 1.14.7 + * Bug 31845: Bump GCC version to 9.3.0 + * Bug 34011: Bump clang to 9.0.1 + * Bug 34014: Enable sqlite3 support in Python + * Bug 34390: Don't copy DBM libraries anymore + * Bug 34391: Remove unused --enable-signmar option + * Bug 40004: Adapt Rust project for Firefox 78 ESR [tor-browser-build] + * Bug 40005: Adapt Node project for Firefox 78 ESR [tor-browser-build] + * Bug 40006: Adapt cbindgen for Firefox 78 ESR [tor-browser-build] + * Bug 40037: Move projects over to clang-source [tor-browser-build] + * Bug 40026: Fix full .mar creation for esr78 [tor-browser-build] + * Bug 40027: Fix incremental .mar creation for esr78 [tor-browser-build] + * Bug 40028: Do not reference unset env variables [tor-browser-build] + * Bug 40031: Add licenses for kcp-go and smux. [tor-browser-build] + * Bug 40045: Fix complete .mar file creation for dmg2mar [tor-browser-build] + * Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1 [tor-browser-build] + * Bug 40087: Deterministically add HTTPS Everywhere into omni.ja [tor-browser-build] + * Windows + * Bug 34230: Update Windows toolchain for Firefox 78 ESR + * Bug 40015: Use only 64bit fxc2 [tor-browser-build] + * Bug 40017: Enable stripping again on Windows [tor-browser-build] + * Bug 40052: Bump NSIS to 3.06.1 [tor-browser-build] + * Bug 40061: Omit the Windows default browser agent from the build [tor-browser] + * Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems [tor-browser-build] + * Bug 40077: Don't pass --no-insert-timestamp when building Firefox [tor-browser-build] + * Bug 40090: NSIS 3.06.1 based builds are not reproducible anymore [tor-browser-build] + * OS X + * Bug 34229: Update macOS toolchain for Firefox 78 ESR + * Bug 40003: Update cctools version for Firefox 78 ESR [tor-browser-build] + * Bug 40018: Add libtapi project for cctools [tor-browser-build] + * Bug 40019: Ship our own runtime library for macOS [tor-browser-build] + * Linux + * Bug 34359: Adapt abicheck.cc to deal with newer GCC version + * Bug 34386: Fix up clang compilation on Linux + * Bug 40053: Also create the langpacks tarball for non-release builds [tor-browser-build] + Tor Browser 10.0a7 -- September 14 2020 * Windows + OS X + Linux * Update Tor Launcher to 0.2.24

1 0

[tor-browser/tor-browser-81.0b9-10.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 26 Sep '20

26 Sep '20

commit 9e380b2e181813da457c2474ed6629c571131d6e Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Sep 24 20:28:29 2020 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes #40148. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index bac98ce06540..278c368c823c 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -180,6 +180,7 @@ pref("privacy.resistFingerprinting.letterboxing", true); // not leak that difference if possible. pref("dom.netinfo.enabled", false); pref("network.http.referer.defaultPolicy", 2); // Bug 32948: Make referer behavior consistent regardless of private browing mode status +pref("media.videocontrols.picture-in-picture.enabled", false); // Bug 40148: disable until audited in #40147 // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[tor-browser/tor-browser-78.3.0esr-10.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 26 Sep '20

26 Sep '20

commit 7061f07e6ef910fd35c3a67e378ed8ed979b3bc6 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Sep 24 20:28:29 2020 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes #40148. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7e29c788b720..304443230cf0 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -180,6 +180,7 @@ pref("privacy.resistFingerprinting.letterboxing", true); // not leak that difference if possible. pref("dom.netinfo.enabled", false); pref("network.http.referer.defaultPolicy", 2); // Bug 32948: Make referer behavior consistent regardless of private browing mode status +pref("media.videocontrols.picture-in-picture.enabled", false); // Bug 40148: disable until audited in #40147 // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[tor-browser/tor-browser-78.3.0esr-10.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 26 Sep '20

26 Sep '20

commit 94e52171a3390e100f71b4808b675fb61de6939c Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Sep 24 20:28:29 2020 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes #40148. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index bac98ce06540..278c368c823c 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -180,6 +180,7 @@ pref("privacy.resistFingerprinting.letterboxing", true); // not leak that difference if possible. pref("dom.netinfo.enabled", false); pref("network.http.referer.defaultPolicy", 2); // Bug 32948: Make referer behavior consistent regardless of private browing mode status +pref("media.videocontrols.picture-in-picture.enabled", false); // Bug 40148: disable until audited in #40147 // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 2 commits: Bug 34378: Port external helper app prompting
by Matthew Finkel 25 Sep '20

25 Sep '20

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: 67e28112 by Alex Catarineu at 2020-09-22T17:43:24+02:00 Bug 34378: Port external helper app prompting With the corresponding android-components patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. - - - - - 8b0f722f by Matthew Finkel at 2020-09-25T19:06:31+00:00 Merge remote-tracking branch 'acatgl/34378' into tor-browser-81.1.1-10.0-1 - - - - - 2 changed files: - app/src/main/java/org/mozilla/fenix/HomeActivity.kt - app/src/main/java/org/mozilla/fenix/share/ShareController.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -4,6 +4,7 @@ package org.mozilla.fenix +import android.app.PendingIntent import android.content.BroadcastReceiver import android.content.Context import android.content.Intent @@ -45,6 +46,8 @@ import mozilla.components.browser.state.state.SessionState import mozilla.components.browser.state.state.WebExtensionState import mozilla.components.concept.engine.EngineSession import mozilla.components.concept.engine.EngineView +import mozilla.components.feature.app.links.RedirectDialogFragment +import mozilla.components.feature.app.links.SimpleRedirectDialogFragment import mozilla.components.feature.contextmenu.DefaultSelectionActionDelegate import mozilla.components.feature.privatemode.notification.PrivateNotificationFeature import mozilla.components.feature.search.BrowserStoreSearchAdapter @@ -58,6 +61,7 @@ import mozilla.components.support.ktx.kotlin.isUrl import mozilla.components.support.ktx.kotlin.toNormalizedUrl import mozilla.components.support.locale.LocaleAwareAppCompatActivity import mozilla.components.support.utils.SafeIntent +import mozilla.components.support.utils.TorUtils import mozilla.components.support.utils.toSafeIntent import mozilla.components.support.webextensions.WebExtensionPopupFeature import org.mozilla.fenix.GleanMetrics.Metrics @@ -154,6 +158,8 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { private lateinit var navigationToolbar: Toolbar + private var dialog: RedirectDialogFragment? = null + final override fun onCreate(savedInstanceState: Bundle?) { // Give Orbot the base Context Prefs.setContext(applicationContext) @@ -387,6 +393,26 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { super.recreate() } + // Copied from mozac AppLinksFeature.kt + internal fun getOrCreateDialog(): RedirectDialogFragment { + val existingDialog = dialog + if (existingDialog != null) { + return existingDialog + } + + SimpleRedirectDialogFragment.newInstance().also { + dialog = it + return it + } + } + private fun isAlreadyADialogCreated(): Boolean { + return findPreviousDialogFragment() != null + } + + private fun findPreviousDialogFragment(): RedirectDialogFragment? { + return supportFragmentManager.findFragmentByTag(RedirectDialogFragment.FRAGMENT_TAG) as? RedirectDialogFragment + } + /** * Handles intents received when the activity is open. */ @@ -394,6 +420,25 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { super.onNewIntent(intent) intent ?: return + val startIntent = intent.getParcelableExtra<PendingIntent>(TorUtils.TORBROWSER_START_ACTIVITY_PROMPT) + if (startIntent != null) { + if (startIntent.creatorPackage == applicationContext.packageName) { + val dialog = getOrCreateDialog() + dialog.onConfirmRedirect = { + try { + startIntent.send() + } catch (error: PendingIntent.CanceledException) { + } + } + dialog.onCancelRedirect = {} + + if (!isAlreadyADialogCreated()) { + dialog.showNow(supportFragmentManager, RedirectDialogFragment.FRAGMENT_TAG) + } + } + return + } + // Diagnostic breadcrumb for "Display already aquired" crash: // https://github.com/mozilla-mobile/android-components/issues/7960 breadcrumb( ===================================== app/src/main/java/org/mozilla/fenix/share/ShareController.kt ===================================== @@ -25,6 +25,7 @@ import mozilla.components.concept.sync.TabData import mozilla.components.feature.accounts.push.SendTabUseCases import mozilla.components.feature.share.RecentAppsStorage import mozilla.components.support.ktx.kotlin.isExtensionUrl +import mozilla.components.support.utils.TorUtils import org.mozilla.fenix.R import org.mozilla.fenix.components.FenixSnackbar import org.mozilla.fenix.components.metrics.Event @@ -99,7 +100,7 @@ class DefaultShareController( } val result = try { - context.startActivity(intent) + TorUtils.startActivityPrompt(context, intent) ShareController.Result.SUCCESS } catch (e: SecurityException) { snackbar.setText(context.getString(R.string.share_error_snackbar)) View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/7b11da2715b7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/7b11da2715b7… You're receiving this email because of your account on gitlab.torproject.org.

1 0