Commit d665878e authored by Mike Perry's avatar Mike Perry
Browse files

Bug 1941: Maintain labels of search engine dtd items for translations.

Also its not clear yet if duckduckgo can handle our traffic as the default.
Plus I kind of like ixquicks's proxy feature, for when Tor is blocked by a
link and Eris really wants you to work for that data ;)
parent 651be65f
......@@ -347,14 +347,14 @@
<radiogroup align="center" orient="horizontal" id="torbutton_searchEngine">
<radio id="torbutton_engine1" label="&torbutton.prefs.engine1;"
oncommand="torbutton_prefs_set_field_attributes(document)"/>
<radio id="torbutton_engine5" label="&torbutton.prefs.engine5;"
oncommand="torbutton_prefs_set_field_attributes(document)"/>
<radio id="torbutton_engine2" label="&torbutton.prefs.engine2;"
oncommand="torbutton_prefs_set_field_attributes(document)"/>
<radio id="torbutton_engine3" label="&torbutton.prefs.engine3;"
oncommand="torbutton_prefs_set_field_attributes(document)"/>
<radio id="torbutton_engine4" label="&torbutton.prefs.engine4;"
oncommand="torbutton_prefs_set_field_attributes(document)"/>
<radio id="torbutton_engine5" label="&torbutton.prefs.engine5;"
oncommand="torbutton_prefs_set_field_attributes(document)"/>
</radiogroup>
</hbox>
......
......@@ -99,9 +99,9 @@
<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
<!ENTITY torbutton.prefs.engine1 "duckduckgo.com">
<!ENTITY torbutton.prefs.engine2 "ixquick.com">
<!ENTITY torbutton.prefs.engine3 "Bing.com">
<!ENTITY torbutton.prefs.engine4 "Yahoo.com">
<!ENTITY torbutton.prefs.engine5 "scroogle.org">
<!ENTITY torbutton.prefs.engine1 "ixquick.com">
<!ENTITY torbutton.prefs.engine2 "Bing.com">
<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
<!ENTITY torbutton.prefs.engine4 "scroogle.org">
<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
......@@ -175,11 +175,11 @@ pref("extensions.torbutton.xfer_google_cookies", true);
pref("extensions.torbutton.google_redir_url", 1);
pref("extensions.torbutton.dodge_google_captcha", true);
pref("extensions.torbutton.asked_google_captcha", false);
pref("extensions.torbutton.redir_url.1", "https://duckduckgo.com/?q=");
pref("extensions.torbutton.redir_url.2", "https://www.ixquick.com/do/metasearch.pl?query=");
pref("extensions.torbutton.redir_url.3", "http://www.bing.com/search?q=");
pref("extensions.torbutton.redir_url.4", "http://search.yahoo.com/search?p=");
pref("extensions.torbutton.redir_url.5", "https://ssl.scroogle.org/cgi-bin/nbbwssl.cgi?Gw=");
pref("extensions.torbutton.redir_url.1", "https://www.ixquick.com/do/metasearch.pl?query=");
pref("extensions.torbutton.redir_url.2", "http://www.bing.com/search?q=");
pref("extensions.torbutton.redir_url.3", "http://search.yahoo.com/search?p=");
pref("extensions.torbutton.redir_url.4", "https://ssl.scroogle.org/cgi-bin/nbbwssl.cgi?Gw=");
pref("extensions.torbutton.redir_url.5", "https://duckduckgo.com/?q=");
pref("extensions.torbutton.fix_google_srch", true);
// User agent prefs:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment