Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit a34b2851 authored by csagan5's avatar csagan5
Browse files

Release 73.0.3683.61

parent a672f8d0

CHANGELOG.md

+7 −0
Original line number Diff line number Diff line 
# 73.0.3683.61

* drop patches with functionality now available from upstream (DuckDuckGo and Qwant search engines, TLS 1.3 final)

* add only DuckDuckGo Lite search engine

* provide image URL for Qwant

* disable safe browsing subresource filter by default

* fix PAC URL support in proxy configuration



# 72.0.3626.120

* add support for resource type in adblock engine (fixes https://github.com/bromite/bromite/issues/115)

* adblock engine speed optimizations

build/filters/adblock_entries.h

+306 −158

File changed.

File size exceeds preview limit.

View original file
View changed file

build/patches/AV1-codec-support.patch

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ Report AV1 as playable on Android 
diff --git a/media/base/mime_util_internal.cc b/media/base/mime_util_internal.cc

--- a/media/base/mime_util_internal.cc

+++ b/media/base/mime_util_internal.cc

@@ -548,9 +548,13 @@ bool MimeUtil::IsCodecSupportedOnAndroid(

@@ -540,9 +540,13 @@ bool MimeUtil::IsCodecSupportedOnAndroid(

     case THEORA:

       return false;
@@ -75,7 +75,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn 
diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni

--- a/third_party/libaom/libaom_srcs.gni

+++ b/third_party/libaom/libaom_srcs.gni

@@ -479,6 +479,11 @@ aom_mem_sources = [

@@ -483,6 +483,11 @@ aom_mem_sources = [

 

 aom_ports_asm_x86 = [ "//third_party/libaom/source/libaom/aom_ports/emms.asm" ]

build/patches/Add-DuckDuckGo-Lite-search-engine.patch

0 → 100644
+625 −0
Original line number Diff line number Diff line 
From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Thu, 12 Oct 2017 11:06:18 +0200

Subject: Add DuckDuckGo Lite search engine



---

 .../search_engines/prepopulated_engines.json       |  10 ++

 components/search_engines/search_engine_type.h     |   1 +

 .../template_url_prepopulate_data.cc               | 129 +++++++++++----------

 3 files changed, 76 insertions(+), 64 deletions(-)



diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json

--- a/components/search_engines/prepopulated_engines.json

+++ b/components/search_engines/prepopulated_engines.json

@@ -95,6 +95,16 @@

       "id": 68

     },

 

+    "duckduckgo_light": {

+      "name": "DuckDuckGo Light",

+      "keyword": "duckduckgo.com/lite",

+      "favicon_url": "https://duckduckgo.com/favicon.ico",

+      "search_url": "https://duckduckgo.com/lite/?q={searchTerms}",

+      "suggest_url": "https://duckduckgo.com/ac/?q={searchTerms}&type=list",

+      "type": "SEARCH_ENGINE_DUCKDUCKGOLIGHT",

+      "id": 12

+    },

+

     "duckduckgo": {

       "name": "DuckDuckGo",

       "keyword": "duckduckgo.com",

diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h

--- a/components/search_engines/search_engine_type.h

+++ b/components/search_engines/search_engine_type.h

@@ -65,6 +65,7 @@ enum SearchEngineType {

   SEARCH_ENGINE_360,

   SEARCH_ENGINE_COCCOC,

   SEARCH_ENGINE_DUCKDUCKGO,

+  SEARCH_ENGINE_DUCKDUCKGOLIGHT,

   SEARCH_ENGINE_PARSIJOO,

   SEARCH_ENGINE_QWANT,

   SEARCH_ENGINE_STARTPAGE,

diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc

--- a/components/search_engines/template_url_prepopulate_data.cc

+++ b/components/search_engines/template_url_prepopulate_data.cc

@@ -35,6 +35,7 @@ const PrepopulatedEngine* const engines_default[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Note, the below entries are sorted by country code, not the name in comment.

@@ -44,7 +45,7 @@ const PrepopulatedEngine* const engines_AE[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Albania

@@ -60,7 +61,7 @@ const PrepopulatedEngine* const engines_AR[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo_ar,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Austria

@@ -68,7 +69,7 @@ const PrepopulatedEngine* const engines_AT[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo_at,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Australia

@@ -76,7 +77,7 @@ const PrepopulatedEngine* const engines_AU[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo_au,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Bosnia and Herzegovina

@@ -92,7 +93,7 @@ const PrepopulatedEngine* const engines_BE[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Bulgaria

@@ -124,7 +125,7 @@ const PrepopulatedEngine* const engines_BN[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Bolivia

@@ -132,7 +133,7 @@ const PrepopulatedEngine* const engines_BO[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Brazil

@@ -140,7 +141,7 @@ const PrepopulatedEngine* const engines_BR[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo_br,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Belarus

@@ -156,19 +157,19 @@ const PrepopulatedEngine* const engines_BZ[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Canada

 const PrepopulatedEngine* const engines_CA[] = {

-    &googleen, &google, &startpage, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo,

+    &googleen, &google, &startpage, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, &duckduckgo_light,

 };

 

 // Switzerland

 const PrepopulatedEngine* const engines_CH[] = {

     &googleen, &google, &startpage,

     &bing,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

     &yahoo_ch,

 };

 

@@ -177,7 +178,7 @@ const PrepopulatedEngine* const engines_CL[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo_cl,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // China

@@ -190,7 +191,7 @@ const PrepopulatedEngine* const engines_CO[] = {

     &googleen, &google, &startpage,

     &yahoo_co,

     &bing,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Costa Rica

@@ -198,7 +199,7 @@ const PrepopulatedEngine* const engines_CR[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Czech Republic

@@ -214,7 +215,7 @@ const PrepopulatedEngine* const engines_DE[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo_de,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Denmark

@@ -222,7 +223,7 @@ const PrepopulatedEngine* const engines_DK[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo_dk,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Dominican Republic

@@ -230,7 +231,7 @@ const PrepopulatedEngine* const engines_DO[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Algeria

@@ -246,7 +247,7 @@ const PrepopulatedEngine* const engines_EC[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Estonia

@@ -270,7 +271,7 @@ const PrepopulatedEngine* const engines_ES[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo_es,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Finland

@@ -278,7 +279,7 @@ const PrepopulatedEngine* const engines_FI[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo_fi,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Faroe Islands

@@ -286,7 +287,7 @@ const PrepopulatedEngine* const engines_FO[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // France

@@ -302,7 +303,7 @@ const PrepopulatedEngine* const engines_GB[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo_uk,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Greece

@@ -310,7 +311,7 @@ const PrepopulatedEngine* const engines_GR[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Guatemala

@@ -318,7 +319,7 @@ const PrepopulatedEngine* const engines_GT[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Hong Kong

@@ -334,7 +335,7 @@ const PrepopulatedEngine* const engines_HN[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Croatia

@@ -342,7 +343,7 @@ const PrepopulatedEngine* const engines_HR[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Hungary

@@ -350,7 +351,7 @@ const PrepopulatedEngine* const engines_HU[] = {

     &googleen, &google, &startpage,

     &yahoo,

     &bing,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Indonesia

@@ -358,7 +359,7 @@ const PrepopulatedEngine* const engines_ID[] = {

     &googleen, &google, &startpage,

     &yahoo_id,

     &bing,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Ireland

@@ -366,7 +367,7 @@ const PrepopulatedEngine* const engines_IE[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Israel

@@ -382,7 +383,7 @@ const PrepopulatedEngine* const engines_IN[] = {

     &googleen, &google, &startpage,

     &yahoo_in,

     &bing,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Iraq

@@ -406,7 +407,7 @@ const PrepopulatedEngine* const engines_IS[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Italy

@@ -414,7 +415,7 @@ const PrepopulatedEngine* const engines_IT[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Jamaica

@@ -422,7 +423,7 @@ const PrepopulatedEngine* const engines_JM[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Jordan

@@ -446,7 +447,7 @@ const PrepopulatedEngine* const engines_KE[] = {

     &googleen, &google, &startpage,

     &yahoo,

     &bing,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // South Korea

@@ -478,14 +479,14 @@ const PrepopulatedEngine* const engines_LB[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Liechtenstein

 const PrepopulatedEngine* const engines_LI[] = {

     &googleen, &google, &startpage,

     &bing,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

     &yahoo,

 };

 

@@ -501,7 +502,7 @@ const PrepopulatedEngine* const engines_LT[] = {

 const PrepopulatedEngine* const engines_LU[] = {

     &googleen, &google, &startpage,

     &bing,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

     &yahoo,

 };

 

@@ -534,7 +535,7 @@ const PrepopulatedEngine* const engines_MC[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Moldova

@@ -542,7 +543,7 @@ const PrepopulatedEngine* const engines_MD[] = {

     &googleen, &google, &startpage,

     &yandex_ru,

     &mail_ru,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Montenegro

@@ -558,7 +559,7 @@ const PrepopulatedEngine* const engines_MK[] = {

     &googleen, &google, &startpage,

     &yahoo,

     &bing,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Mexico

@@ -566,7 +567,7 @@ const PrepopulatedEngine* const engines_MX[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo_mx,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Malaysia

@@ -582,7 +583,7 @@ const PrepopulatedEngine* const engines_NI[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Netherlands

@@ -590,7 +591,7 @@ const PrepopulatedEngine* const engines_NL[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo_nl,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Norway

@@ -598,14 +599,14 @@ const PrepopulatedEngine* const engines_NO[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // New Zealand

 const PrepopulatedEngine* const engines_NZ[] = {

     &googleen, &google, &startpage,

     &bing,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

     &yahoo_nz,

 };

 

@@ -622,7 +623,7 @@ const PrepopulatedEngine* const engines_PA[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Peru

@@ -630,7 +631,7 @@ const PrepopulatedEngine* const engines_PE[] = {

     &googleen, &google, &startpage,

     &yahoo_pe,

     &bing,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Philippines

@@ -638,7 +639,7 @@ const PrepopulatedEngine* const engines_PH[] = {

     &googleen, &google, &startpage,

     &yahoo_ph,

     &bing,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Pakistan

@@ -654,7 +655,7 @@ const PrepopulatedEngine* const engines_PL[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Puerto Rico

@@ -662,7 +663,7 @@ const PrepopulatedEngine* const engines_PR[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Portugal

@@ -670,7 +671,7 @@ const PrepopulatedEngine* const engines_PT[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Paraguay

@@ -678,7 +679,7 @@ const PrepopulatedEngine* const engines_PY[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Qatar

@@ -694,7 +695,7 @@ const PrepopulatedEngine* const engines_RO[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Serbia

@@ -702,7 +703,7 @@ const PrepopulatedEngine* const engines_RS[] = {

     &googleen, &google, &startpage,

     &yahoo,

     &bing,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Russia

@@ -734,7 +735,7 @@ const PrepopulatedEngine* const engines_SE[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo_se,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Singapore

@@ -750,7 +751,7 @@ const PrepopulatedEngine* const engines_SI[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Slovakia

@@ -758,7 +759,7 @@ const PrepopulatedEngine* const engines_SK[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // El Salvador

@@ -766,7 +767,7 @@ const PrepopulatedEngine* const engines_SV[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Syria

@@ -806,7 +807,7 @@ const PrepopulatedEngine* const engines_TT[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Taiwan

@@ -838,7 +839,7 @@ const PrepopulatedEngine* const engines_US[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Uruguay

@@ -846,7 +847,7 @@ const PrepopulatedEngine* const engines_UY[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Venezuela

@@ -854,7 +855,7 @@ const PrepopulatedEngine* const engines_VE[] = {

     &googleen, &google, &startpage,

     &yahoo_ve,

     &bing,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Vietnam

@@ -878,7 +879,7 @@ const PrepopulatedEngine* const engines_ZA[] = {

     &googleen, &google, &startpage,

     &bing,

     &yahoo,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

 };

 

 // Zimbabwe

@@ -898,7 +899,7 @@ const PrepopulatedEngine* const kAllEngines[] = {

     &bing,

     &coccoc,

     &daum,

-    &duckduckgo,

+    &duckduckgo, &duckduckgo_light,

     &googleen, &google, &startpage,

     &mail_ru,

     &naver,

-- 

2.11.0

build/patches/Add-DuckDuckGo-search-engine.patch

deleted100644 → 0
+0 −715
Original line number Diff line number Diff line 
From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Thu, 12 Oct 2017 11:06:18 +0200

Subject: Add DuckDuckGo search engine



---

 .../search_engines/prepopulated_engines.json       |  19 ++

 components/search_engines/search_engine_type.h     |   2 +

 .../template_url_prepopulate_data.cc               | 218 ++++++++++-----------

 3 files changed, 130 insertions(+), 109 deletions(-)



diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json

--- a/components/search_engines/prepopulated_engines.json

+++ b/components/search_engines/prepopulated_engines.json

@@ -38,6 +38,25 @@

   // The following engines are included in country lists and are added to the

   // list of search engines on the first run depending on user's country.

   "elements": {

+    "duckduckgo": {

+      "name": "DuckDuckGo",

+      "keyword": "duckduckgo.com",

+      "favicon_url": "https://duckduckgo.com/favicon.ico",

+      "search_url": "https://duckduckgo.com/?q={searchTerms}",

+      "suggest_url": "https://ac.duckduckgo.com/ac/?q={searchTerms}&type=list",

+      "type": "SEARCH_ENGINE_DUCKDUCKGO",

+      "id": 11

+    },

+

+    "duckduckgo_light": {

+      "name": "DuckDuckGo Light",

+      "keyword": "duckduckgo.com/lite",

+      "favicon_url": "https://duckduckgo.com/favicon.ico",

+      "search_url": "https://duckduckgo.com/lite/?q={searchTerms}",

+      "type": "SEARCH_ENGINE_DUCKDUCKGOLIGHT",

+      "id": 12

+    },

+

     "aol": {

       "name": "AOL",

       "keyword": "aol.com",

diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h

--- a/components/search_engines/search_engine_type.h

+++ b/components/search_engines/search_engine_type.h

@@ -63,6 +63,8 @@ enum SearchEngineType {

   SEARCH_ENGINE_YANDEX,

   SEARCH_ENGINE_ZOZNAM,

   SEARCH_ENGINE_360,

+  SEARCH_ENGINE_DUCKDUCKGO,

+  SEARCH_ENGINE_DUCKDUCKGOLIGHT,

   SEARCH_ENGINE_MAX          // Bounding value needed for UMA histogram macro.

 };

 

diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc

--- a/components/search_engines/template_url_prepopulate_data.cc

+++ b/components/search_engines/template_url_prepopulate_data.cc

@@ -33,548 +33,548 @@ namespace {

 

 // Default (for countries with no better engine set)

 const PrepopulatedEngine* const engines_default[] = {

-    &google, &bing, &yahoo,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,

 };

 

 // United Arab Emirates

 const PrepopulatedEngine* const engines_AE[] = {

-    &google, &yahoo_maktoob, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,

 };

 

 // Albania

 const PrepopulatedEngine* const engines_AL[] = {

-    &google, &yahoo, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,

 };

 

 // Argentina

 const PrepopulatedEngine* const engines_AR[] = {

-    &google, &bing, &yahoo_ar,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ar,

 };

 

 // Austria

 const PrepopulatedEngine* const engines_AT[] = {

-    &google, &bing, &yahoo_at,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_at,

 };

 

 // Australia

 const PrepopulatedEngine* const engines_AU[] = {

-    &google, &bing, &yahoo_au,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_au,

 };

 

 // Bosnia and Herzegovina

 const PrepopulatedEngine* const engines_BA[] = {

-    &google, &yahoo, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,

 };

 

 // Belgium

 const PrepopulatedEngine* const engines_BE[] = {

-    &google, &bing, &yahoo, &yahoo_fr,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &yahoo_fr,

 };

 

 // Bulgaria

 const PrepopulatedEngine* const engines_BG[] = {

-    &google, &bing, &ask,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &ask,

 };

 

 // Bahrain

 const PrepopulatedEngine* const engines_BH[] = {

-    &google, &yahoo_maktoob, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,

 };

 

 // Burundi

 const PrepopulatedEngine* const engines_BI[] = {

-    &google, &yahoo, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,

 };

 

 // Brunei

 const PrepopulatedEngine* const engines_BN[] = {

-    &google, &yahoo_my, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,

 };

 

 // Bolivia

 const PrepopulatedEngine* const engines_BO[] = {

-    &google, &bing, &yahoo,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,

 };

 

 // Brazil

 const PrepopulatedEngine* const engines_BR[] = {

-    &google, &ask_br, &bing, &yahoo_br,

+    &google, &duckduckgo, &duckduckgo_light, &ask_br, &bing, &yahoo_br,

 };

 

 // Belarus

 const PrepopulatedEngine* const engines_BY[] = {

-    &google, &yandex_by, &mail_ru,

+    &google, &duckduckgo, &duckduckgo_light, &yandex_by, &mail_ru,

 };

 

 // Belize

 const PrepopulatedEngine* const engines_BZ[] = {

-    &google, &yahoo, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,

 };

 

 // Canada

 const PrepopulatedEngine* const engines_CA[] = {

-    &google, &bing, &ask, &yahoo_ca, &yahoo_qc,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &ask, &yahoo_ca, &yahoo_qc,

 };

 

 // Switzerland

 const PrepopulatedEngine* const engines_CH[] = {

-    &google, &bing, &yahoo_ch,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ch,

 };

 

 // Chile

 const PrepopulatedEngine* const engines_CL[] = {

-    &google, &bing, &yahoo_cl,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_cl,

 };

 

 // China

 const PrepopulatedEngine* const engines_CN[] = {

-    &google, &baidu, &sogou, &so_360,

+    &google, &duckduckgo, &duckduckgo_light, &baidu, &sogou, &so_360,

 };

 

 // Colombia

 const PrepopulatedEngine* const engines_CO[] = {

-    &google, &bing, &yahoo_co,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_co,

 };

 

 // Costa Rica

 const PrepopulatedEngine* const engines_CR[] = {

-    &google, &yahoo, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,

 };

 

 // Czech Republic

 const PrepopulatedEngine* const engines_CZ[] = {

-    &google, &seznam, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &seznam, &bing,

 };

 

 // Germany

 const PrepopulatedEngine* const engines_DE[] = {

-    &google, &bing, &yahoo_de,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,

 };

 

 // Denmark

 const PrepopulatedEngine* const engines_DK[] = {

-    &google, &bing, &yahoo_dk,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_dk,

 };

 

 // Dominican Republic

 const PrepopulatedEngine* const engines_DO[] = {

-    &google, &yahoo, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,

 };

 

 // Algeria

 const PrepopulatedEngine* const engines_DZ[] = {

-    &google, &bing, &yahoo_maktoob,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,

 };

 

 // Ecuador

 const PrepopulatedEngine* const engines_EC[] = {

-    &google, &bing, &yahoo,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,

 };

 

 // Estonia

 const PrepopulatedEngine* const engines_EE[] = {

-    &google, &bing, &yahoo,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,

 };

 

 // Egypt

 const PrepopulatedEngine* const engines_EG[] = {

-    &google, &yahoo_maktoob, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,

 };

 

 // Spain

 const PrepopulatedEngine* const engines_ES[] = {

-    &google, &bing, &yahoo_es,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_es,

 };

 

 // Faroe Islands

 const PrepopulatedEngine* const engines_FO[] = {

-    &google, &bing, &ask,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &ask,

 };

 

 // Finland

 const PrepopulatedEngine* const engines_FI[] = {

-    &google, &bing, &yahoo_fi,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fi,

 };

 

 // France

 const PrepopulatedEngine* const engines_FR[] = {

-    &google, &bing, &yahoo_fr,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,

 };

 

 // United Kingdom

 const PrepopulatedEngine* const engines_GB[] = {

-    &google, &bing, &yahoo_uk, &ask_uk,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk, &ask_uk,

 };

 

 // Greece

 const PrepopulatedEngine* const engines_GR[] = {

-    &google, &bing, &yahoo_gr,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_gr,

 };

 

 // Guatemala

 const PrepopulatedEngine* const engines_GT[] = {

-    &google, &yahoo, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,

 };

 

 // Hong Kong

 const PrepopulatedEngine* const engines_HK[] = {

-    &google, &yahoo_hk, &baidu, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_hk, &baidu, &bing,

 };

 

 // Honduras

 const PrepopulatedEngine* const engines_HN[] = {

-    &google, &yahoo, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,

 };

 

 // Croatia

 const PrepopulatedEngine* const engines_HR[] = {

-    &google, &bing, &yahoo,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,

 };

 

 // Hungary

 const PrepopulatedEngine* const engines_HU[] = {

-    &google, &bing, &yahoo,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,

 };

 

 // Indonesia

 const PrepopulatedEngine* const engines_ID[] = {

-    &google, &yahoo_id, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_id, &bing,

 };

 

 // Ireland

 const PrepopulatedEngine* const engines_IE[] = {

-    &google, &bing, &yahoo_uk,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk,

 };

 

 // Israel

 const PrepopulatedEngine* const engines_IL[] = {

-    &google, &yahoo, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,

 };

 

 // India

 const PrepopulatedEngine* const engines_IN[] = {

-    &google, &bing, &yahoo_in,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_in,

 };

 

 // Iraq

 const PrepopulatedEngine* const engines_IQ[] = {

-    &google, &yahoo_maktoob, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,

 };

 

 // Iran

 const PrepopulatedEngine* const engines_IR[] = {

-    &google, &yahoo, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,

 };

 

 // Iceland

 const PrepopulatedEngine* const engines_IS[] = {

-    &google, &bing, &yahoo,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,

 };

 

 // Italy

 const PrepopulatedEngine* const engines_IT[] = {

-    &google, &virgilio, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &virgilio, &bing,

 };

 

 // Jamaica

 const PrepopulatedEngine* const engines_JM[] = {

-    &google, &yahoo, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,

 };

 

 // Jordan

 const PrepopulatedEngine* const engines_JO[] = {

-    &google, &yahoo_maktoob, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,

 };

 

 // Japan

 const PrepopulatedEngine* const engines_JP[] = {

-    &google, &yahoo_jp, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_jp, &bing,

 };

 

 // Kenya

 const PrepopulatedEngine* const engines_KE[] = {

-    &google, &yahoo, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,

 };

 

 // Kuwait

 const PrepopulatedEngine* const engines_KW[] = {

-    &google, &yahoo_maktoob, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,

 };

 

 // South Korea

 const PrepopulatedEngine* const engines_KR[] = {

-    &google, &naver, &daum,

+    &google, &duckduckgo, &duckduckgo_light, &naver, &daum,

 };

 

 // Kazakhstan

 const PrepopulatedEngine* const engines_KZ[] = {

-    &google, &mail_ru, &yandex_kz,

+    &google, &duckduckgo, &duckduckgo_light, &mail_ru, &yandex_kz,

 };

 

 // Lebanon

 const PrepopulatedEngine* const engines_LB[] = {

-    &google, &yahoo_maktoob, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,

 };

 

 // Liechtenstein

 const PrepopulatedEngine* const engines_LI[] = {

-    &google, &bing, &yahoo_de,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,

 };

 

 // Lithuania

 const PrepopulatedEngine* const engines_LT[] = {

-    &google, &bing, &yandex_ru,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yandex_ru,

 };

 

 // Luxembourg

 const PrepopulatedEngine* const engines_LU[] = {

-    &google, &bing, &yahoo_fr,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,

 };

 

 // Latvia

 const PrepopulatedEngine* const engines_LV[] = {

-    &google, &yandex_ru, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yandex_ru, &bing,

 };

 

 // Libya

 const PrepopulatedEngine* const engines_LY[] = {

-    &google, &yahoo_maktoob, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,

 };

 

 // Morocco

 const PrepopulatedEngine* const engines_MA[] = {

-    &google, &bing, &yahoo_maktoob,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,

 };

 

 // Monaco

 const PrepopulatedEngine* const engines_MC[] = {

-    &google, &yahoo_fr, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_fr, &bing,

 };

 

 // Moldova

 const PrepopulatedEngine* const engines_MD[] = {

-    &google, &bing, &yahoo,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,

 };

 

 // Montenegro

 const PrepopulatedEngine* const engines_ME[] = {

-    &google, &bing, &yahoo,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,

 };

 

 // Macedonia

 const PrepopulatedEngine* const engines_MK[] = {

-    &google, &yahoo, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,

 };

 

 // Mexico

 const PrepopulatedEngine* const engines_MX[] = {

-    &google, &bing, &yahoo_mx,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_mx,

 };

 

 // Malaysia

 const PrepopulatedEngine* const engines_MY[] = {

-    &google, &yahoo_my, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,

 };

 

 // Nicaragua

 const PrepopulatedEngine* const engines_NI[] = {

-    &google, &yahoo, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,

 };

 

 // Netherlands

 const PrepopulatedEngine* const engines_NL[] = {

-    &google, &yahoo_nl, &vinden,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_nl, &vinden,

 };

 

 // Norway

 const PrepopulatedEngine* const engines_NO[] = {

-    &google, &bing, &kvasir,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &kvasir,

 };

 

 // New Zealand

 const PrepopulatedEngine* const engines_NZ[] = {

-    &google, &bing, &yahoo_nz,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_nz,

 };

 

 // Oman

 const PrepopulatedEngine* const engines_OM[] = {

-    &google, &bing, &yahoo_maktoob,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,

 };

 

 // Panama

 const PrepopulatedEngine* const engines_PA[] = {

-    &google, &yahoo, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,

 };

 

 // Peru

 const PrepopulatedEngine* const engines_PE[] = {

-    &google, &bing, &yahoo_pe,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_pe,

 };

 

 // Philippines

 const PrepopulatedEngine* const engines_PH[] = {

-    &google, &yahoo_ph, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_ph, &bing,

 };

 

 // Pakistan

 const PrepopulatedEngine* const engines_PK[] = {

-    &google, &yahoo, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,

 };

 

 // Puerto Rico

 const PrepopulatedEngine* const engines_PR[] = {

-    &google, &yahoo, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,

 };

 

 // Poland

 const PrepopulatedEngine* const engines_PL[] = {

-    &google, &onet, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &onet, &bing,

 };

 

 // Portugal

 const PrepopulatedEngine* const engines_PT[] = {

-    &google, &bing, &yahoo,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,

 };

 

 // Paraguay

 const PrepopulatedEngine* const engines_PY[] = {

-    &google, &bing, &yahoo,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,

 };

 

 // Qatar

 const PrepopulatedEngine* const engines_QA[] = {

-    &google, &yahoo_maktoob, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,

 };

 

 // Romania

 const PrepopulatedEngine* const engines_RO[] = {

-    &google, &yahoo_ro, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_ro, &bing,

 };

 

 // Serbia

 const PrepopulatedEngine* const engines_RS[] = {

-    &google, &bing, &yahoo,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,

 };

 

 // Russia

 const PrepopulatedEngine* const engines_RU[] = {

-    &google, &yandex_ru, &mail_ru,

+    &google, &duckduckgo, &duckduckgo_light, &yandex_ru, &mail_ru,

 };

 

 // Rwanda

 const PrepopulatedEngine* const engines_RW[] = {

-    &google, &bing, &yahoo,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,

 };

 

 // Saudi Arabia

 const PrepopulatedEngine* const engines_SA[] = {

-    &google, &yahoo_maktoob, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,

 };

 

 // Sweden

 const PrepopulatedEngine* const engines_SE[] = {

-    &google, &bing, &yahoo_se,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_se,

 };

 

 // Singapore

 const PrepopulatedEngine* const engines_SG[] = {

-    &google, &yahoo_sg, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_sg, &bing,

 };

 

 // Slovenia

 const PrepopulatedEngine* const engines_SI[] = {

-    &google, &najdi, &ask,

+    &google, &duckduckgo, &duckduckgo_light, &najdi, &ask,

 };

 

 // Slovakia

 const PrepopulatedEngine* const engines_SK[] = {

-    &google, &bing, &yahoo,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,

 };

 

 // El Salvador

 const PrepopulatedEngine* const engines_SV[] = {

-    &google, &yahoo, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,

 };

 

 // Syria

 const PrepopulatedEngine* const engines_SY[] = {

-    &google, &bing, &yahoo_maktoob,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,

 };

 

 // Thailand

 const PrepopulatedEngine* const engines_TH[] = {

-    &google, &yahoo_th, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_th, &bing,

 };

 

 // Tunisia

 const PrepopulatedEngine* const engines_TN[] = {

-    &google, &bing, &yahoo_maktoob,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,

 };

 

 // Turkey

 const PrepopulatedEngine* const engines_TR[] = {

-    &google, &bing, &yahoo_tr, &yandex_tr,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_tr, &yandex_tr,

 };

 

 // Trinidad and Tobago

 const PrepopulatedEngine* const engines_TT[] = {

-    &google, &bing, &yahoo,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,

 };

 

 // Taiwan

 const PrepopulatedEngine* const engines_TW[] = {

-    &google, &yahoo_tw, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_tw, &bing,

 };

 

 // Tanzania

 const PrepopulatedEngine* const engines_TZ[] = {

-    &google, &yahoo, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,

 };

 

 // Ukraine

 const PrepopulatedEngine* const engines_UA[] = {

-    &google, &yandex_ua, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yandex_ua, &bing,

 };

 

 // United States

 const PrepopulatedEngine* const engines_US[] = {

-    &google, &bing, &yahoo, &aol, &ask,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &aol, &ask,

 };

 

 // Uruguay

 const PrepopulatedEngine* const engines_UY[] = {

-    &google, &bing, &yahoo,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,

 };

 

 // Venezuela

 const PrepopulatedEngine* const engines_VE[] = {

-    &google, &bing, &yahoo_ve,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ve,

 };

 

 // Vietnam

 const PrepopulatedEngine* const engines_VN[] = {

-    &google, &yahoo_vn, &bing,

+    &google, &duckduckgo, &duckduckgo_light, &yahoo_vn, &bing,

 };

 

 // Yemen

 const PrepopulatedEngine* const engines_YE[] = {

-    &google, &bing, &yahoo_maktoob,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,

 };

 

 // South Africa

 const PrepopulatedEngine* const engines_ZA[] = {

-    &google, &bing, &yahoo,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,

 };

 

 // Zimbabwe

 const PrepopulatedEngine* const engines_ZW[] = {

-    &google, &bing, &yahoo, &ask,

+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &ask,

 };

 

 // A list of all the engines that we know about.

 const PrepopulatedEngine* const kAllEngines[] = {

     // Prepopulated engines:

-    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &kvasir,

+    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &duckduckgo, &duckduckgo_light, &kvasir,

     &mail_ru, &najdi, &naver, &onet, &seznam, &sogou, &vinden, &virgilio,

     &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,

     &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,

-- 

2.11.0