commit d32d150709d2bf24ae329878281f27bddfea2dc5 Author: Alex Catarineu acat@torproject.org Date: Mon Sep 30 16:47:47 2019 +0200

fixup! Bug 25741 - TBA: Add mozconfig for Android and pertinent branding files. --- mobile/android/branding/alpha/locales/en-US/brand.dtd | 4 ++-- mobile/android/branding/alpha/locales/en-US/brand.properties | 4 ++-- mobile/android/branding/nightly/locales/en-US/brand.dtd | 4 ++-- mobile/android/branding/nightly/locales/en-US/brand.properties | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mobile/android/branding/alpha/locales/en-US/brand.dtd b/mobile/android/branding/alpha/locales/en-US/brand.dtd index 4d84be3466e9..248c6567215a 100644 --- a/mobile/android/branding/alpha/locales/en-US/brand.dtd +++ b/mobile/android/branding/alpha/locales/en-US/brand.dtd @@ -2,8 +2,8 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<!ENTITY brandShortName "Alpha"> -<!ENTITY brandFullName "Tor Browser Alpha"> +<!ENTITY brandShortName "Tor Browser"> +<!ENTITY brandFullName "Tor Browser"> <!-- LOCALIZATION NOTE (brandProductName): This brand name can be used in messages where the product name needs to remain unchanged across different versions (Nightly, Beta, etc.). --> diff --git a/mobile/android/branding/alpha/locales/en-US/brand.properties b/mobile/android/branding/alpha/locales/en-US/brand.properties index 2437e17b4712..34636cab411c 100644 --- a/mobile/android/branding/alpha/locales/en-US/brand.properties +++ b/mobile/android/branding/alpha/locales/en-US/brand.properties @@ -2,8 +2,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-brandShortName=Alpha -brandFullName=Tor Browser Alpha +brandShortName=Tor Browser +brandFullName=Tor Browser # LOCALIZATION NOTE(brandProductName): # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). diff --git a/mobile/android/branding/nightly/locales/en-US/brand.dtd b/mobile/android/branding/nightly/locales/en-US/brand.dtd index 6eaad721ca94..248c6567215a 100644 --- a/mobile/android/branding/nightly/locales/en-US/brand.dtd +++ b/mobile/android/branding/nightly/locales/en-US/brand.dtd @@ -2,8 +2,8 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<!ENTITY brandShortName "Nightly"> -<!ENTITY brandFullName "Tor Browser Nightly"> +<!ENTITY brandShortName "Tor Browser"> +<!ENTITY brandFullName "Tor Browser"> <!-- LOCALIZATION NOTE (brandProductName): This brand name can be used in messages where the product name needs to remain unchanged across different versions (Nightly, Beta, etc.). --> diff --git a/mobile/android/branding/nightly/locales/en-US/brand.properties b/mobile/android/branding/nightly/locales/en-US/brand.properties index 1279e3752251..34636cab411c 100644 --- a/mobile/android/branding/nightly/locales/en-US/brand.properties +++ b/mobile/android/branding/nightly/locales/en-US/brand.properties @@ -2,8 +2,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-brandShortName=Nightly -brandFullName=Tor Browser Nightly +brandShortName=Tor Browser +brandFullName=Tor Browser # LOCALIZATION NOTE(brandProductName): # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.).