[or-cvs] [torbutton/maint-1.2 4/5] Bug 1941: Maintain labels of search engine dtd items for translations.

[mikeperry at torproject.org]

Author: Mike Perry <mikeperry-git at fscked.org>
Date: Thu, 30 Sep 2010 07:57:42 -0700
Subject: Bug 1941: Maintain labels of search engine dtd items for translations.
Commit: d665878e270581faf7d3b6151a21a7a60f0fa6ff

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 ;)
---
 src/chrome/content/preferences.xul      |    4 ++--
 src/chrome/locale/en/torbutton.dtd      |   10 +++++-----
 src/defaults/preferences/preferences.js |   10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
index 93e69fc..952d6c8 100644
--- a/src/chrome/content/preferences.xul
+++ b/src/chrome/content/preferences.xul
@@ -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>
 
diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd
index 739b50d..c4efab4 100644
--- a/src/chrome/locale/en/torbutton.dtd
+++ b/src/chrome/locale/en/torbutton.dtd
@@ -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">
diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
index 80d5577..9356201 100644
--- a/src/defaults/preferences/preferences.js
+++ b/src/defaults/preferences/preferences.js
@@ -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:
-- 
1.7.1