[tor-commits] [torbutton/master] Incorporate browser branding, search engine overrides, etc.

[mikeperry@xxxxxxxxxxxxxx]

commit 3dabcaf86daeeb101b6055890be37e41e780b571
Author: Kathy Brade <brade@xxxxxxxxxxxxxxxxx>
Date:   Thu May 9 16:45:42 2013 -0400

    Incorporate browser branding, search engine overrides, etc.
---
 src/chrome.manifest                     |    4 ++++
 src/chrome/locale/en/brand.dtd          |    8 ++++++++
 src/chrome/locale/en/brand.properties   |   15 +++++++++++++++
 src/chrome/locale/en/browser.properties |   13 +++++++++++++
 src/defaults/preferences/preferences.js |    8 ++++++++
 5 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/src/chrome.manifest b/src/chrome.manifest
index 99cb6b7..e57e62f 100644
--- a/src/chrome.manifest
+++ b/src/chrome.manifest
@@ -4,6 +4,10 @@ overlay chrome://browser/content/preferences/connection.xul chrome://torbutton/c
 overlay chrome://messenger/content/messenger.xul chrome://torbutton/content/torbutton_tb.xul
 overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://torbutton/content/torbutton_tb.xul
 
+# browser branding
+override chrome://branding/locale/brand.dtd chrome://torbutton/locale/brand.dtd
+override chrome://branding/locale/brand.properties chrome://torbutton/locale/brand.properties
+
 locale torbutton af chrome/locale/af/
 locale torbutton ak chrome/locale/ak/
 locale torbutton am chrome/locale/am/
diff --git a/src/chrome/locale/en/brand.dtd b/src/chrome/locale/en/brand.dtd
new file mode 100644
index 0000000..76e405d
--- /dev/null
+++ b/src/chrome/locale/en/brand.dtd
@@ -0,0 +1,8 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - 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  brandFullName         "Tor Browser">
+<!ENTITY  vendorShortName       "Tor Project">
+<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
diff --git a/src/chrome/locale/en/brand.properties b/src/chrome/locale/en/brand.properties
new file mode 100644
index 0000000..9ae168e
--- /dev/null
+++ b/src/chrome/locale/en/brand.properties
@@ -0,0 +1,15 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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
+brandFullName=Tor Browser
+vendorShortName=Tor Project
+
+homePageSingleStartMain=Firefox Start, a fast home page with built-in search
+homePageImport=Import your home page from %S
+
+homePageMigrationPageTitle=Home Page Selection
+homePageMigrationDescription=Please select the home page you wish to use:
+
+syncBrandShortName=Sync
diff --git a/src/chrome/locale/en/browser.properties b/src/chrome/locale/en/browser.properties
new file mode 100644
index 0000000..395bdba
--- /dev/null
+++ b/src/chrome/locale/en/browser.properties
@@ -0,0 +1,13 @@
+# Default home page
+browser.startup.homepage=https://check.torproject.org/?lang=en-US&small=1&uptodate=1
+
+# Spell checker dictionary
+spellchecker.dictionary=en_US
+
+# Default search engine
+browser.search.defaultenginename=Startpage
+
+# Search engine order (order displayed in the search bar dropdown)
+browser.search.order.1=Startpage
+browser.search.order.2=DuckDuckGo
+browser.search.order.3=Google
diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
index c5cf4d4..7559977 100644
--- a/src/defaults/preferences/preferences.js
+++ b/src/defaults/preferences/preferences.js
@@ -218,3 +218,11 @@ pref("extensions.torbutton.dual_key_cookies",false);
 pref("extensions.torbutton.cookie_js_allow", true);
 pref("extensions.torbutton.prompt_torbrowser", true);
 pref("extensions.torbutton.confirm_plugins", true);
+
+// Browser home page, spell checker dictionary, and search engine overrides:
+pref("browser.startup.homepage", "chrome://torbutton/locale/browser.properties");
+pref("spellchecker.dictionary", "chrome://torbutton/locale/browser.properties");
+pref("browser.search.defaultenginename", "chrome://torbutton/locale/browser.properties");
+pref("browser.search.order.1", "chrome://torbutton/locale/browser.properties");
+pref("browser.search.order.2", "chrome://torbutton/locale/browser.properties");
+pref("browser.search.order.3", "chrome://torbutton/locale/browser.properties");



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits