[tbb-commits] [tor-browser/tor-browser-24.8.0esr-4.x-1] Bug 13091: Use "Tor Browser" everywhere (space included)

[mikeperry at torproject.org]

commit b269bb036db77aef26bef86d947006c27992b683
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Tue Sep 9 11:52:08 2014 -0400

    Bug 13091: Use "Tor Browser" everywhere (space included)
    
    Changed MOZ_APP_DISPLAYNAME and brandShortName from "TorBrowser" to
    "Tor Browser".
---
 .mozconfig                                               |    2 +-
 .mozconfig-asan                                          |    2 +-
 .mozconfig-mac                                           |    2 +-
 .mozconfig-mingw                                         |    2 +-
 browser/branding/official/configure.sh                   |    2 +-
 browser/branding/official/locales/en-US/brand.dtd        |    2 +-
 browser/branding/official/locales/en-US/brand.properties |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.mozconfig b/.mozconfig
index 97e0349..f0c5510 100755
--- a/.mozconfig
+++ b/.mozconfig
@@ -1,7 +1,7 @@
 . $topsrcdir/browser/config/mozconfig
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj- at CONFIG_GUESS@
-mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser
+mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
diff --git a/.mozconfig-asan b/.mozconfig-asan
index 32e3096..ffbde72 100644
--- a/.mozconfig-asan
+++ b/.mozconfig-asan
@@ -10,7 +10,7 @@ export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fsanitize=undefined -st
 export LDFLAGS="-fsanitize=address -fsanitize=undefined"
 
 mk_add_option sMOZ_OBJDIR=@TOPSRCDIR@/obj- at CONFIG_GUESS@
-mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser
+mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
diff --git a/.mozconfig-mac b/.mozconfig-mac
index 7f28096..01ed601 100644
--- a/.mozconfig-mac
+++ b/.mozconfig-mac
@@ -25,7 +25,7 @@ LD=$ROOTDIR/x86_64-apple-darwin10-ld
 STRIP=$ROOTDIR/x86_64-apple-darwin10-strip
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos
-mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser
+mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
 mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
 
diff --git a/.mozconfig-mingw b/.mozconfig-mingw
index 9c8695d..f3fc080 100644
--- a/.mozconfig-mingw
+++ b/.mozconfig-mingw
@@ -5,7 +5,7 @@ ac_add_options --enable-application=browser
 ac_add_options --target=i686-w64-mingw32
 ac_add_options --enable-default-toolkit=cairo-windows
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw
-mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser
+mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
diff --git a/browser/branding/official/configure.sh b/browser/branding/official/configure.sh
index 33102b0..2b1b638 100644
--- a/browser/branding/official/configure.sh
+++ b/browser/branding/official/configure.sh
@@ -2,5 +2,5 @@
 # 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/.
 
-MOZ_APP_DISPLAYNAME=TorBrowser
+MOZ_APP_DISPLAYNAME="Tor Browser"
 MOZ_UA_BUILDID=20100101
diff --git a/browser/branding/official/locales/en-US/brand.dtd b/browser/branding/official/locales/en-US/brand.dtd
index 76e405d..59f665e 100644
--- a/browser/branding/official/locales/en-US/brand.dtd
+++ b/browser/branding/official/locales/en-US/brand.dtd
@@ -2,7 +2,7 @@
    - 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        "TorBrowser">
+<!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
 <!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
diff --git a/browser/branding/official/locales/en-US/brand.properties b/browser/branding/official/locales/en-US/brand.properties
index 9ae168e..f63def3 100644
--- a/browser/branding/official/locales/en-US/brand.properties
+++ b/browser/branding/official/locales/en-US/brand.properties
@@ -2,7 +2,7 @@
 # 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=TorBrowser
+brandShortName=Tor Browser
 brandFullName=Tor Browser
 vendorShortName=Tor Project