commit d653d7bdff8e36366d551968dfac1cad9cd1dbef Author: Georg Koppen gk@torproject.org Date: Fri Jan 23 12:03:52 2015 +0000

fixup! Bug #4902: Add DDG and StartPage to Omnibox.

We don't mess with the region.properties anymore as this is fragile: Translators start to translate the search engine names (see #11236). We put the necessary values into our central preference file, 000-tor-browser.js, instead of overriding the values set in the respective locales. --- browser/locales/en-US/chrome/browser-region/region.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties index 16963f3..e078ed5 100644 --- a/browser/locales/en-US/chrome/browser-region/region.properties +++ b/browser/locales/en-US/chrome/browser-region/region.properties @@ -3,12 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/.

# Default search engine -browser.search.defaultenginename=Startpage +browser.search.defaultenginename=Google

# Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google +browser.search.order.1=Google +browser.search.order.2=Yahoo +browser.search.order.3=Bing

# This is the default set of web based feed handlers shown in the reader # selection UI