[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tor-browser] 76/81: Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing



This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-1
in repository tor-browser.

commit 768e5da6d7163dd70298f8b55b72c43ebf65523f
Author: Mike Perry <mikeperry-git@xxxxxxxxxxxxxx>
AuthorDate: Fri May 5 03:41:57 2017 -0700

    Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
    
    eBay and Amazon don't treat Tor users very well. Accounts often get locked and
    payments reversed.
    
    Also:
    Bug 16322: Update DuckDuckGo search engine
    
    We are replacing the clearnet URL with an onion service one (thanks to a
    patch by a cypherpunk) and are removing the duplicated DDG search
    engine. Duplicating DDG happend due to bug 1061736 where Mozilla
    included DDG itself into Firefox. Interestingly, this caused breaking
    the DDG search if JavaScript is disabled as the Mozilla engine, which
    gets loaded earlier, does not use the html version of the search page.
    Moreover, the Mozilla engine tracked where the users were searching from
    by adding a respective parameter to the search query. We got rid of that
    feature as well.
    
    Also:
    This fixes bug 20809: the DuckDuckGo team has changed its server-side
    code in a way that lets users with JavaScript enabled use the default
    landing page while those without JavaScript available get redirected
    directly to the non-JS page. We adapt the search engine URLs
    accordingly.
    
    Also fixes bug 29798 by making sure we only specify the Google search
    engine we actually ship an .xml file for.
    
    Also regression tests.
    
    squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
    
    Bug 40494: Update Startpage search provider
    
    squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
    
    Bug 40438: Add Blockchair as a search engine
    
    Bug 33342: Avoid disconnect search addon error after removal.
    
    We removed the addon in #32767, but it was still being loaded
    from addonStartup.json.lz4 and throwing an error on startup
    because its resource: location is not available anymore.
---
 .../search/extensions/blockchair-onion/favicon.png | Bin 0 -> 3116 bytes
 .../extensions/blockchair-onion/manifest.json      |  26 ++++++++++++
 .../search/extensions/blockchair/favicon.png       | Bin 0 -> 2898 bytes
 .../search/extensions/blockchair/manifest.json     |  26 ++++++++++++
 .../search/extensions/ddg-onion/favicon.ico        | Bin 0 -> 973 bytes
 .../search/extensions/ddg-onion/manifest.json      |  26 ++++++++++++
 .../components/search/extensions/ddg/favicon.ico   | Bin 5430 -> 0 bytes
 .../components/search/extensions/ddg/favicon.png   | Bin 0 -> 1150 bytes
 .../components/search/extensions/ddg/manifest.json |  38 ++----------------
 .../extensions/google/_locales/b-1-d/messages.json |  23 -----------
 .../extensions/google/_locales/b-1-e/messages.json |  23 -----------
 .../extensions/google/_locales/b-d/messages.json   |  23 -----------
 .../extensions/google/_locales/b-e/messages.json   |  23 -----------
 .../extensions/google/_locales/en/messages.json    |  24 -----------
 .../google/_locales/region-by/messages.json        |  20 ----------
 .../google/_locales/region-kz/messages.json        |  20 ----------
 .../google/_locales/region-ru/messages.json        |  20 ----------
 .../google/_locales/region-tr/messages.json        |  20 ----------
 .../search/extensions/google/manifest.json         |  17 ++++----
 .../search/extensions/startpage/favicon.png        | Bin 0 -> 1150 bytes
 .../search/extensions/startpage/manifest.json      |  26 ++++++++++++
 .../search/extensions/twitter/favicon.ico          | Bin 0 -> 1650 bytes
 .../search/extensions/twitter/manifest.json        |  26 ++++++++++++
 .../extensions/wikipedia/_locales/NN/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/NO/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/af/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/an/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ar/messages.json |  20 ----------
 .../wikipedia/_locales/ast/messages.json           |  20 ----------
 .../extensions/wikipedia/_locales/az/messages.json |  20 ----------
 .../wikipedia/_locales/be-tarask/messages.json     |  20 ----------
 .../extensions/wikipedia/_locales/be/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/bg/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/bn/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/br/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/bs/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ca/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/cy/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/cz/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/da/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/de/messages.json |  20 ----------
 .../wikipedia/_locales/dsb/messages.json           |  20 ----------
 .../extensions/wikipedia/_locales/el/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/en/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/eo/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/es/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/et/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/eu/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/fa/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/fi/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/fr/messages.json |  20 ----------
 .../wikipedia/_locales/fy-NL/messages.json         |  20 ----------
 .../wikipedia/_locales/ga-IE/messages.json         |  20 ----------
 .../extensions/wikipedia/_locales/gd/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/gl/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/gn/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/gu/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/he/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/hi/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/hr/messages.json |  20 ----------
 .../wikipedia/_locales/hsb/messages.json           |  20 ----------
 .../extensions/wikipedia/_locales/hu/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/hy/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ia/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/id/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/is/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/it/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ja/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ka/messages.json |  20 ----------
 .../wikipedia/_locales/kab/messages.json           |  20 ----------
 .../extensions/wikipedia/_locales/kk/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/km/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/kn/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/kr/messages.json |  20 ----------
 .../wikipedia/_locales/lij/messages.json           |  20 ----------
 .../extensions/wikipedia/_locales/lo/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/lt/messages.json |  20 ----------
 .../wikipedia/_locales/ltg/messages.json           |  20 ----------
 .../extensions/wikipedia/_locales/lv/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/mk/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/mr/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ms/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/my/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ne/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/nl/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/oc/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/pa/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/pl/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/pt/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/rm/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ro/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ru/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/si/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/sk/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/sl/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/sq/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/sr/messages.json |  20 ----------
 .../wikipedia/_locales/sv-SE/messages.json         |  20 ----------
 .../extensions/wikipedia/_locales/ta/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/te/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/th/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/tl/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/tr/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/uk/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ur/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/uz/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/vi/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/wo/messages.json |  20 ----------
 .../wikipedia/_locales/zh-CN/messages.json         |  20 ----------
 .../wikipedia/_locales/zh-TW/messages.json         |  20 ----------
 .../search/extensions/wikipedia/manifest.json      |  15 ++++---
 .../components/search/extensions/yahoo/favicon.ico | Bin 0 -> 5430 bytes
 .../search/extensions/yahoo/manifest.json          |  28 +++++++++++++
 .../search/extensions/youtube/favicon.ico          | Bin 0 -> 1150 bytes
 .../search/extensions/youtube/manifest.json        |  26 ++++++++++++
 tbb-tests/browser_tor_omnibox.js                   |  20 ++++++++++
 toolkit/components/search/SearchService.jsm        |  44 ++++++++-------------
 .../mozapps/extensions/internal/XPIProvider.jsm    |   6 +++
 118 files changed, 244 insertions(+), 2016 deletions(-)

diff --git a/browser/components/search/extensions/blockchair-onion/favicon.png b/browser/components/search/extensions/blockchair-onion/favicon.png
new file mode 100644
index 000000000000..92d832ded172
Binary files /dev/null and b/browser/components/search/extensions/blockchair-onion/favicon.png differ
diff --git a/browser/components/search/extensions/blockchair-onion/manifest.json b/browser/components/search/extensions/blockchair-onion/manifest.json
new file mode 100644
index 000000000000..e7d15ee50247
--- /dev/null
+++ b/browser/components/search/extensions/blockchair-onion/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "BlockchairOnion",
+  "description": "Blockchair Onion",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "blockchair-onion@xxxxxxxxxxxxxxxxxx"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": [
+    "favicon.png"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "BlockchairOnion",
+      "search_url": "http://blkchairbknpn73cfjhevhla7rkp4ed5gg2knctvv7it4lioy22defid.onion/search";,
+      "search_form": "http://blkchairbknpn73cfjhevhla7rkp4ed5gg2knctvv7it4lioy22defid.onion/search/?q={searchTerms}";,
+      "search_url_post_params": "q={searchTerms}"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/blockchair/favicon.png b/browser/components/search/extensions/blockchair/favicon.png
new file mode 100644
index 000000000000..f4869e87e008
Binary files /dev/null and b/browser/components/search/extensions/blockchair/favicon.png differ
diff --git a/browser/components/search/extensions/blockchair/manifest.json b/browser/components/search/extensions/blockchair/manifest.json
new file mode 100644
index 000000000000..0f16b9049cf2
--- /dev/null
+++ b/browser/components/search/extensions/blockchair/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Blockchair",
+  "description": "Blockchair",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "blockchair@xxxxxxxxxxxxxxxxxx"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": [
+    "favicon.png"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Blockchair",
+      "search_url": "https://blockchair.com/search";,
+      "search_form": "https://blockchair.com/search/?q={searchTerms}";,
+      "search_url_get_params": "q={searchTerms}"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/ddg-onion/favicon.ico b/browser/components/search/extensions/ddg-onion/favicon.ico
new file mode 100644
index 000000000000..13c325f6585f
Binary files /dev/null and b/browser/components/search/extensions/ddg-onion/favicon.ico differ
diff --git a/browser/components/search/extensions/ddg-onion/manifest.json b/browser/components/search/extensions/ddg-onion/manifest.json
new file mode 100644
index 000000000000..49f3c116106b
--- /dev/null
+++ b/browser/components/search/extensions/ddg-onion/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "DuckDuckGoOnion",
+  "description": "Duck Duck Go Onion",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "ddg-onion@xxxxxxxxxxxxxxxxxx"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "DuckDuckGoOnion",
+      "search_url": "https://duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad.onion";,
+      "search_form": "https://duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad.onion/?q={searchTerms}";,
+      "search_url_get_params": "q={searchTerms}"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/ddg/favicon.ico b/browser/components/search/extensions/ddg/favicon.ico
deleted file mode 100644
index 560000b03e2c..000000000000
Binary files a/browser/components/search/extensions/ddg/favicon.ico and /dev/null differ
diff --git a/browser/components/search/extensions/ddg/favicon.png b/browser/components/search/extensions/ddg/favicon.png
new file mode 100644
index 000000000000..c853b95b89ef
Binary files /dev/null and b/browser/components/search/extensions/ddg/favicon.png differ
diff --git a/browser/components/search/extensions/ddg/manifest.json b/browser/components/search/extensions/ddg/manifest.json
index 782b860a679f..4a3b0ad20fe9 100644
--- a/browser/components/search/extensions/ddg/manifest.json
+++ b/browser/components/search/extensions/ddg/manifest.json
@@ -10,50 +10,18 @@
   },
   "hidden": true,
   "icons": {
-    "16": "favicon.ico"
+    "16": "favicon.png"
   },
   "web_accessible_resources": [
-    "favicon.ico"
+    "favicon.png"
   ],
   "chrome_settings_overrides": {
     "search_provider": {
       "keyword": ["@duckduckgo", "@ddg"],
       "name": "DuckDuckGo",
-      "search_url": "https://duckduckgo.com/";,
+      "search_url": "https://duckduckgo.com";,
       "search_form": "https://duckduckgo.com/?q={searchTerms}";,
       "search_url_get_params": "q={searchTerms}",
-      "params": [
-        {
-          "name": "t",
-          "condition": "purpose",
-          "purpose": "contextmenu",
-          "value": "ffcm"
-        },
-        {
-          "name": "t",
-          "condition": "purpose",
-          "purpose": "keyword",
-          "value": "ffab"
-        },
-        {
-          "name": "t",
-          "condition": "purpose",
-          "purpose": "searchbar",
-          "value": "ffsb"
-        },
-        {
-          "name": "t",
-          "condition": "purpose",
-          "purpose": "homepage",
-          "value": "ffhp"
-        },
-        {
-          "name": "t",
-          "condition": "purpose",
-          "purpose": "newtab",
-          "value": "ffnt"
-        }
-      ],
       "suggest_url": "https://ac.duckduckgo.com/ac/";,
       "suggest_url_get_params": "q={searchTerms}&type=list"
     }
diff --git a/browser/components/search/extensions/google/_locales/b-1-d/messages.json b/browser/components/search/extensions/google/_locales/b-1-d/messages.json
deleted file mode 100644
index 1b9d05307d64..000000000000
--- a/browser/components/search/extensions/google/_locales/b-1-d/messages.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "extensionName": {
-    "message": "Google"
-  },
-  "extensionDescription": {
-    "message": "Google Search"
-  },
-  "searchUrl": {
-    "message": "https://www.google.com/search";
-  },
-  "searchForm": {
-    "message": "https://www.google.com/search?client=firefox-b-1-d&q={searchTerms}";
-  },
-  "suggestUrl": {
-    "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "client=firefox-b-1-d&q={searchTerms}"
-  },
-  "channelPref": {
-    "message": "google_channel_us"
-  }
-}
diff --git a/browser/components/search/extensions/google/_locales/b-1-e/messages.json b/browser/components/search/extensions/google/_locales/b-1-e/messages.json
deleted file mode 100644
index b470cd844331..000000000000
--- a/browser/components/search/extensions/google/_locales/b-1-e/messages.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "extensionName": {
-    "message": "Google"
-  },
-  "extensionDescription": {
-    "message": "Google Search"
-  },
-  "searchUrl": {
-    "message": "https://www.google.com/search";
-  },
-  "searchForm": {
-    "message": "https://www.google.com/search?client=firefox-b-1-e&q={searchTerms}";
-  },
-  "suggestUrl": {
-    "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "client=firefox-b-1-e&q={searchTerms}"
-  },
-  "channelPref": {
-    "message": "google_channel_us"
-  }
-}
diff --git a/browser/components/search/extensions/google/_locales/b-d/messages.json b/browser/components/search/extensions/google/_locales/b-d/messages.json
deleted file mode 100644
index a6423089d9f9..000000000000
--- a/browser/components/search/extensions/google/_locales/b-d/messages.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "extensionName": {
-    "message": "Google"
-  },
-  "extensionDescription": {
-    "message": "Google Search"
-  },
-  "searchUrl": {
-    "message": "https://www.google.com/search";
-  },
-  "searchForm": {
-    "message": "https://www.google.com/search?client=firefox-b-d&q={searchTerms}";
-  },
-  "suggestUrl": {
-    "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "client=firefox-b-d&q={searchTerms}"
-  },
-  "channelPref": {
-    "message": "google_channel_row"
-  }
-}
diff --git a/browser/components/search/extensions/google/_locales/b-e/messages.json b/browser/components/search/extensions/google/_locales/b-e/messages.json
deleted file mode 100644
index 70939ee00074..000000000000
--- a/browser/components/search/extensions/google/_locales/b-e/messages.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "extensionName": {
-    "message": "Google"
-  },
-  "extensionDescription": {
-    "message": "Google Search"
-  },
-  "searchUrl": {
-    "message": "https://www.google.com/search";
-  },
-  "searchForm": {
-    "message": "https://www.google.com/search?client=firefox-b-e&q={searchTerms}";
-  },
-  "suggestUrl": {
-    "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "client=firefox-b-e&q={searchTerms}"
-  },
-  "channelPref": {
-    "message": "google_channel_row"
-  }
-}
diff --git a/browser/components/search/extensions/google/_locales/en/messages.json b/browser/components/search/extensions/google/_locales/en/messages.json
deleted file mode 100644
index aeca0ef128b3..000000000000
--- a/browser/components/search/extensions/google/_locales/en/messages.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "extensionName": {
-    "message": "Google"
-  },
-  "extensionDescription": {
-    "message": "Google Search"
-  },
-  "searchUrl": {
-    "message": "https://www.google.com/search";
-  },
-  "searchForm": {
-    "message": "https://www.google.com/search?client=firefox-b-d&q={searchTerms}";
-  },
-  "suggestUrl": {
-    "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "client=firefox-b-d&q={searchTerms}"
-  },
-  "channelPref": {
-    "message": "google_channel_row"
-  }
-
-}
diff --git a/browser/components/search/extensions/google/_locales/region-by/messages.json b/browser/components/search/extensions/google/_locales/region-by/messages.json
deleted file mode 100644
index 60e5ed5eda07..000000000000
--- a/browser/components/search/extensions/google/_locales/region-by/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Google"
-  },
-  "extensionDescription": {
-    "message": "Google Search"
-  },
-  "searchUrl": {
-    "message": "https://www.google.by/search";
-  },
-  "searchForm": {
-    "message": "https://www.google.by/search?q={searchTerms}";
-  },
-  "suggestUrl": {
-    "message": "https://www.google.by/complete/search?client=firefox&q={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "q={searchTerms}"
-  }
-}
diff --git a/browser/components/search/extensions/google/_locales/region-kz/messages.json b/browser/components/search/extensions/google/_locales/region-kz/messages.json
deleted file mode 100644
index 8e64096bc114..000000000000
--- a/browser/components/search/extensions/google/_locales/region-kz/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Google"
-  },
-  "extensionDescription": {
-    "message": "Google Search"
-  },
-  "searchUrl": {
-    "message": "https://www.google.kz/search";
-  },
-  "searchForm": {
-    "message": "https://www.google.kz/search?q={searchTerms}";
-  },
-  "suggestUrl": {
-    "message": "https://www.google.kz/complete/search?client=firefox&q={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "q={searchTerms}"
-  }
-}
diff --git a/browser/components/search/extensions/google/_locales/region-ru/messages.json b/browser/components/search/extensions/google/_locales/region-ru/messages.json
deleted file mode 100644
index 8a78bb4e7f87..000000000000
--- a/browser/components/search/extensions/google/_locales/region-ru/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Google"
-  },
-  "extensionDescription": {
-    "message": "Google Search"
-  },
-  "searchUrl": {
-    "message": "https://www.google.ru/search";
-  },
-  "searchForm": {
-    "message": "https://www.google.ru/search?q={searchTerms}";
-  },
-  "suggestUrl": {
-    "message": "https://www.google.ru/complete/search?client=firefox&q={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "q={searchTerms}"
-  }
-}
diff --git a/browser/components/search/extensions/google/_locales/region-tr/messages.json b/browser/components/search/extensions/google/_locales/region-tr/messages.json
deleted file mode 100644
index 8e373a4833b9..000000000000
--- a/browser/components/search/extensions/google/_locales/region-tr/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Google"
-  },
-  "extensionDescription": {
-    "message": "Google Search"
-  },
-  "searchUrl": {
-    "message": "https://www.google.com.tr/search";
-  },
-  "searchForm": {
-    "message": "https://www.google.com.tr/search?q={searchTerms}";
-  },
-  "suggestUrl": {
-    "message": "https://www.google.com.tr/complete/search?client=firefox&q={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "q={searchTerms}"
-  }
-}
diff --git a/browser/components/search/extensions/google/manifest.json b/browser/components/search/extensions/google/manifest.json
index 6cd4d2a42358..e84a269e4ea1 100644
--- a/browser/components/search/extensions/google/manifest.json
+++ b/browser/components/search/extensions/google/manifest.json
@@ -1,6 +1,6 @@
 {
-  "name": "__MSG_extensionName__",
-  "description": "__MSG_extensionDescription__",
+  "name": "Google",
+  "description": "Google Search",
   "manifest_version": 2,
   "version": "1.2",
   "applications": {
@@ -9,7 +9,6 @@
     }
   },
   "hidden": true,
-  "default_locale": "en",
   "icons": {
     "16": "favicon.ico"
   },
@@ -19,18 +18,18 @@
   "chrome_settings_overrides": {
     "search_provider": {
       "keyword": "@google",
-      "name": "__MSG_extensionName__",
-      "search_url": "__MSG_searchUrl__",
-      "search_form": "__MSG_searchForm__",
-      "suggest_url": "__MSG_suggestUrl__",
+      "name": "Google",
+      "search_url": "https://www.google.com/search";,
+      "search_form": "https://www.google.com/search?client=firefox-b-d&q={searchTerms}";,
+      "suggest_url": "https://www.google.com/complete/search?client=firefox&q={searchTerms}";,
       "params": [
         {
           "name": "channel",
           "condition": "pref",
-          "pref": "__MSG_channelPref__"
+          "pref": "google_channel_row"
         }
       ],
-      "search_url_get_params": "__MSG_searchUrlGetParams__"
+      "search_url_get_params": "client=firefox-b-d&q={searchTerms}"
     }
   }
 }
diff --git a/browser/components/search/extensions/startpage/favicon.png b/browser/components/search/extensions/startpage/favicon.png
new file mode 100644
index 000000000000..44b94a986fd2
Binary files /dev/null and b/browser/components/search/extensions/startpage/favicon.png differ
diff --git a/browser/components/search/extensions/startpage/manifest.json b/browser/components/search/extensions/startpage/manifest.json
new file mode 100644
index 000000000000..497373ec17a2
--- /dev/null
+++ b/browser/components/search/extensions/startpage/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Startpage",
+  "description": "Startpage",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "startpage@xxxxxxxxxxxxxxxxxx"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": [
+    "favicon.png"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Startpage",
+      "search_url": "https://www.startpage.com/sp/search";,
+      "search_form": "https://www.startpage.com/sp/search/";,
+      "search_url_post_params": "q={searchTerms}"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/twitter/favicon.ico b/browser/components/search/extensions/twitter/favicon.ico
new file mode 100644
index 000000000000..e5aaff437912
Binary files /dev/null and b/browser/components/search/extensions/twitter/favicon.ico differ
diff --git a/browser/components/search/extensions/twitter/manifest.json b/browser/components/search/extensions/twitter/manifest.json
new file mode 100644
index 000000000000..59714e0e1045
--- /dev/null
+++ b/browser/components/search/extensions/twitter/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Twitter",
+  "description": "Realtime Twitter Search",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "twitter@xxxxxxxxxxxxxxxxxx"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Twitter",
+      "search_url": "https://twitter.com/search";,
+      "search_form": "https://twitter.com/search?q={searchTerms}&partner=Firefox&source=desktop-search";,
+      "search_url_get_params": "q={searchTerms}&partner=Firefox&source=desktop-search"
+    }
+  }
+}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/NN/messages.json b/browser/components/search/extensions/wikipedia/_locales/NN/messages.json
deleted file mode 100644
index e4ee66bc780d..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/NN/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (nn)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, det frie oppslagsverket"
-  },
-  "searchUrl": {
-    "message": "https://nn.wikipedia.org/wiki/Spesial:Søk";
-  },
-  "searchForm": {
-    "message": "https://nn.wikipedia.org/wiki/Spesial:Søk?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://nn.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/NO/messages.json b/browser/components/search/extensions/wikipedia/_locales/NO/messages.json
deleted file mode 100644
index ec016ac7337e..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/NO/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (no)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, den frie encyklopedi"
-  },
-  "searchUrl": {
-    "message": "https://no.wikipedia.org/wiki/Spesial:Søk";
-  },
-  "searchForm": {
-    "message": "https://no.wikipedia.org/wiki/Spesial:Søk?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://no.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/af/messages.json b/browser/components/search/extensions/wikipedia/_locales/af/messages.json
deleted file mode 100644
index 8cf9de8ac9b3..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/af/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (af)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, die vrye ensiklopedie"
-  },
-  "searchUrl": {
-    "message": "https://af.wikipedia.org/wiki/Spesiaal:Soek";
-  },
-  "searchForm": {
-    "message": "https://af.wikipedia.org/wiki/Spesiaal:Soek?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://af.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/an/messages.json b/browser/components/search/extensions/wikipedia/_locales/an/messages.json
deleted file mode 100644
index e8cce665c96e..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/an/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Biquipedia (an)"
-  },
-  "extensionDescription": {
-    "message": "A enciclopedia Libre"
-  },
-  "searchUrl": {
-    "message": "https://an.wikipedia.org/wiki/Especial:Mirar";
-  },
-  "searchForm": {
-    "message": "https://an.wikipedia.org/wiki/Especial:Mirar?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://an.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ar/messages.json b/browser/components/search/extensions/wikipedia/_locales/ar/messages.json
deleted file mode 100644
index de90b2a2055e..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ar/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "ويكيبيديا (ar)"
-  },
-  "extensionDescription": {
-    "message": "ويكيبيديا (ar)"
-  },
-  "searchUrl": {
-    "message": "https://ar.wikipedia.org/wiki/خاص:بحث";
-  },
-  "searchForm": {
-    "message": "https://ar.wikipedia.org/wiki/خاص:بحث?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://ar.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ast/messages.json b/browser/components/search/extensions/wikipedia/_locales/ast/messages.json
deleted file mode 100644
index a127ba07f29b..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ast/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (ast)"
-  },
-  "extensionDescription": {
-    "message": "La enciclopedia llibre"
-  },
-  "searchUrl": {
-    "message": "https://ast.wikipedia.org/wiki/Especial:Gueta";
-  },
-  "searchForm": {
-    "message": "https://ast.wikipedia.org/wiki/Especial:Gueta?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://ast.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/az/messages.json b/browser/components/search/extensions/wikipedia/_locales/az/messages.json
deleted file mode 100644
index f551a717e6d3..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/az/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Vikipediya (az)"
-  },
-  "extensionDescription": {
-    "message": "Vikipediya, açıq ensiklopediya"
-  },
-  "searchUrl": {
-    "message": "https://az.wikipedia.org/wiki/Xüsusi:Axtar";
-  },
-  "searchForm": {
-    "message": "https://az.wikipedia.org/wiki/Xüsusi:Axtar?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://az.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/be-tarask/messages.json b/browser/components/search/extensions/wikipedia/_locales/be-tarask/messages.json
deleted file mode 100644
index aecfecf2fb19..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/be-tarask/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Вікіпэдыя (be-tarask)"
-  },
-  "extensionDescription": {
-    "message": "Вікіпэдыя, вольная энцыкляпэдыя"
-  },
-  "searchUrl": {
-    "message": "https://be-tarask.wikipedia.org/wiki/Спэцыяльныя:Пошук";
-  },
-  "searchForm": {
-    "message": "https://be-tarask.wikipedia.org/wiki/Спэцыяльныя:Пошук?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://be-tarask.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/be/messages.json b/browser/components/search/extensions/wikipedia/_locales/be/messages.json
deleted file mode 100644
index 6aa763451e67..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/be/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Вікіпедыя (be)"
-  },
-  "extensionDescription": {
-    "message": "Вікіпедыя, свабодная энцыклапедыя"
-  },
-  "searchUrl": {
-    "message": "https://be.wikipedia.org/wiki/Адмысловае:Search";
-  },
-  "searchForm": {
-    "message": "https://be.wikipedia.org/wiki/Адмысловае:Search?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://be.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/bg/messages.json b/browser/components/search/extensions/wikipedia/_locales/bg/messages.json
deleted file mode 100644
index 896a85d66b87..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/bg/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Уикипедия (bg)"
-  },
-  "extensionDescription": {
-    "message": "Уикипедия, свободната енциклоподия"
-  },
-  "searchUrl": {
-    "message": "https://bg.wikipedia.org/wiki/Специални:Търсене";
-  },
-  "searchForm": {
-    "message": "https://bg.wikipedia.org/wiki/Специални:Търсене?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://bg.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/bn/messages.json b/browser/components/search/extensions/wikipedia/_locales/bn/messages.json
deleted file mode 100644
index fe9887ed1938..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/bn/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "উইকিপিডিয়া (bn)"
-  },
-  "extensionDescription": {
-    "message": "উইকিপিডিয়া, মুক্ত বিশ্বকোষ"
-  },
-  "searchUrl": {
-    "message": "https://bn.wikipedia.org/wiki/বিশেষ:Search";
-  },
-  "searchForm": {
-    "message": "https://bn.wikipedia.org/wiki/বিশেষ:Search?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://bn.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/br/messages.json b/browser/components/search/extensions/wikipedia/_locales/br/messages.json
deleted file mode 100644
index 33869ce8e752..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/br/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (br)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, an holloueziadur digor"
-  },
-  "searchUrl": {
-    "message": "https://br.wikipedia.org/wiki/Dibar:Klask";
-  },
-  "searchForm": {
-    "message": "https://br.wikipedia.org/wiki/Dibar:Klask?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://br.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/bs/messages.json b/browser/components/search/extensions/wikipedia/_locales/bs/messages.json
deleted file mode 100644
index 746150e3d8e8..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/bs/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (bs)"
-  },
-  "extensionDescription": {
-    "message": "Slobodna enciklopedija"
-  },
-  "searchUrl": {
-    "message": "https://bs.wikipedia.org/wiki/Posebno:Pretraga";
-  },
-  "searchForm": {
-    "message": "https://bs.wikipedia.org/wiki/Posebno:Pretraga?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://bs.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ca/messages.json b/browser/components/search/extensions/wikipedia/_locales/ca/messages.json
deleted file mode 100644
index 151ec1a71ba5..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ca/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Viquipèdia (ca)"
-  },
-  "extensionDescription": {
-    "message": "L'enciclopèdia lliure"
-  },
-  "searchUrl": {
-    "message": "https://ca.wikipedia.org/wiki/Especial:Cerca";
-  },
-  "searchForm": {
-    "message": "https://ca.wikipedia.org/wiki/Especial:Cerca?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://ca.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/cy/messages.json b/browser/components/search/extensions/wikipedia/_locales/cy/messages.json
deleted file mode 100644
index cfed7c73be34..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/cy/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wicipedia (cy)"
-  },
-  "extensionDescription": {
-    "message": "Wicipedia, Y Gwyddioniadur Rhydd"
-  },
-  "searchUrl": {
-    "message": "https://cy.wikipedia.org/wiki/Arbennig:Search";
-  },
-  "searchForm": {
-    "message": "https://cy.wikipedia.org/wiki/Arbennig:Search?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://cy.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/cz/messages.json b/browser/components/search/extensions/wikipedia/_locales/cz/messages.json
deleted file mode 100644
index 12f7eb22d711..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/cz/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedie (cs)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, svobodná encyclopedie"
-  },
-  "searchUrl": {
-    "message": "https://cs.wikipedia.org/wiki/Speciální:Hledání";
-  },
-  "searchForm": {
-    "message": "https://cs.wikipedia.org/wiki/Speciální:Hledání?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://cs.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/da/messages.json b/browser/components/search/extensions/wikipedia/_locales/da/messages.json
deleted file mode 100644
index 801d5a5183cc..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/da/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (da)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, den frie encyklopædi"
-  },
-  "searchUrl": {
-    "message": "https://da.wikipedia.org/wiki/Speciel:Søgning";
-  },
-  "searchForm": {
-    "message": "https://da.wikipedia.org/wiki/Speciel:Søgning?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://da.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/de/messages.json b/browser/components/search/extensions/wikipedia/_locales/de/messages.json
deleted file mode 100644
index 0e6bbe8905ca..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/de/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (de)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, die freie Enzyklopädie"
-  },
-  "searchUrl": {
-    "message": "https://de.wikipedia.org/wiki/Spezial:Suche";
-  },
-  "searchForm": {
-    "message": "https://de.wikipedia.org/wiki/Spezial:Suche?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://de.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/dsb/messages.json b/browser/components/search/extensions/wikipedia/_locales/dsb/messages.json
deleted file mode 100644
index ffca44b5f7fb..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/dsb/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedija (dsb)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedija, lichotna encyklopedija"
-  },
-  "searchUrl": {
-    "message": "https://dsb.wikipedia.org/wiki/Specialne:Pytaś";
-  },
-  "searchForm": {
-    "message": "https://dsb.wikipedia.org/wiki/Specialne:Pytaś?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://dsb.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/el/messages.json b/browser/components/search/extensions/wikipedia/_locales/el/messages.json
deleted file mode 100644
index 95b48f3d9ca7..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/el/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (el)"
-  },
-  "extensionDescription": {
-    "message": "Βικιπαίδεια, η ελεύθερη εγκυκλοπαίδεια"
-  },
-  "searchUrl": {
-    "message": "https://el.wikipedia.org/wiki/Ειδικό:Αναζήτηση";
-  },
-  "searchForm": {
-    "message": "https://el.wikipedia.org/wiki/Ειδικό:Αναζήτηση?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://el.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/en/messages.json b/browser/components/search/extensions/wikipedia/_locales/en/messages.json
deleted file mode 100644
index 0de3c9a8071a..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/en/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (en)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, the Free Encyclopedia"
-  },
-  "searchUrl": {
-    "message": "https://en.wikipedia.org/wiki/Special:Search";
-  },
-  "searchForm": {
-    "message": "https://en.wikipedia.org/wiki/Special:Search?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://en.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/eo/messages.json b/browser/components/search/extensions/wikipedia/_locales/eo/messages.json
deleted file mode 100644
index 10aa88dd11ba..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/eo/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Vikipedio (eo)"
-  },
-  "extensionDescription": {
-    "message": "Vikipedio, la libera enciklopedio"
-  },
-  "searchUrl": {
-    "message": "https://eo.wikipedia.org/wiki/Specialaĵo:Serĉi";
-  },
-  "searchForm": {
-    "message": "https://eo.wikipedia.org/wiki/Specialaĵo:Serĉi?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://eo.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/es/messages.json b/browser/components/search/extensions/wikipedia/_locales/es/messages.json
deleted file mode 100644
index 09ec1f757657..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/es/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (es)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, la enciclopedia libre"
-  },
-  "searchUrl": {
-    "message": "https://es.wikipedia.org/wiki/Especial:Buscar";
-  },
-  "searchForm": {
-    "message": "https://es.wikipedia.org/wiki/Especial:Buscar?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://es.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/et/messages.json b/browser/components/search/extensions/wikipedia/_locales/et/messages.json
deleted file mode 100644
index 91363fbb392b..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/et/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Vikipeedia (et)"
-  },
-  "extensionDescription": {
-    "message": "Vikipeedia, vaba entsüklopeedia"
-  },
-  "searchUrl": {
-    "message": "https://et.wikipedia.org/wiki/Eri:Otsimine";
-  },
-  "searchForm": {
-    "message": "https://et.wikipedia.org/wiki/Eri:Otsimine?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://et.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/eu/messages.json b/browser/components/search/extensions/wikipedia/_locales/eu/messages.json
deleted file mode 100644
index 1bd7027dec54..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/eu/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (eu)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, entziklopedia askea"
-  },
-  "searchUrl": {
-    "message": "https://eu.wikipedia.org/wiki/Berezi:Bilatu";
-  },
-  "searchForm": {
-    "message": "https://eu.wikipedia.org/wiki/Berezi:Bilatu?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://eu.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/fa/messages.json b/browser/components/search/extensions/wikipedia/_locales/fa/messages.json
deleted file mode 100644
index 9fdc964a1e0b..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/fa/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "ویکی‌پدیا (fa)"
-  },
-  "extensionDescription": {
-    "message": "ویکی‌پدیا، دانشنامهٔ آزاد"
-  },
-  "searchUrl": {
-    "message": "https://fa.wikipedia.org/wiki/ویژه:جستجو";
-  },
-  "searchForm": {
-    "message": "https://fa.wikipedia.org/wiki/ویژه:جستجو?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://fa.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/fi/messages.json b/browser/components/search/extensions/wikipedia/_locales/fi/messages.json
deleted file mode 100644
index 17a9cbe22c42..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/fi/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (fi)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia (fi), vapaa tietosanakirja"
-  },
-  "searchUrl": {
-    "message": "https://fi.wikipedia.org/wiki/Toiminnot:Haku";
-  },
-  "searchForm": {
-    "message": "https://fi.wikipedia.org/wiki/Toiminnot:Haku?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://fi.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/fr/messages.json b/browser/components/search/extensions/wikipedia/_locales/fr/messages.json
deleted file mode 100644
index 33dcbe9dc502..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/fr/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipédia (fr)"
-  },
-  "extensionDescription": {
-    "message": "Wikipédia, l'encyclopédie libre"
-  },
-  "searchUrl": {
-    "message": "https://fr.wikipedia.org/wiki/Spécial:Recherche";
-  },
-  "searchForm": {
-    "message": "https://fr.wikipedia.org/wiki/Spécial:Recherche?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://fr.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/fy-NL/messages.json b/browser/components/search/extensions/wikipedia/_locales/fy-NL/messages.json
deleted file mode 100644
index f350162fbbaf..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/fy-NL/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedy (fy)"
-  },
-  "extensionDescription": {
-    "message": "De fergese ensyklopedy"
-  },
-  "searchUrl": {
-    "message": "https://fy.wikipedia.org/wiki/Wiki:Sykje";
-  },
-  "searchForm": {
-    "message": "https://fy.wikipedia.org/wiki/Wiki:Sykje?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://fy.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ga-IE/messages.json b/browser/components/search/extensions/wikipedia/_locales/ga-IE/messages.json
deleted file mode 100644
index 994ea723c6da..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ga-IE/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Vicipéid (ga)"
-  },
-  "extensionDescription": {
-    "message": "Vicipéid, an Chiclipéid Shaor"
-  },
-  "searchUrl": {
-    "message": "https://ga.wikipedia.org/wiki/Speisialta:Search";
-  },
-  "searchForm": {
-    "message": "https://ga.wikipedia.org/wiki/Speisialta:Search?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://ga.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/gd/messages.json b/browser/components/search/extensions/wikipedia/_locales/gd/messages.json
deleted file mode 100644
index f16f16fb4a02..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/gd/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Uicipeid (gd)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, An leabhar mòr-eòlais"
-  },
-  "searchUrl": {
-    "message": "https://gd.wikipedia.org/wiki/Sònraichte:Search";
-  },
-  "searchForm": {
-    "message": "https://gd.wikipedia.org/wiki/Sònraichte:Search?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://gd.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/gl/messages.json b/browser/components/search/extensions/wikipedia/_locales/gl/messages.json
deleted file mode 100644
index 88880bffc3d9..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/gl/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (gl)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, a enciclopedia libre"
-  },
-  "searchUrl": {
-    "message": "https://gl.wikipedia.org/wiki/Especial:Procurar";
-  },
-  "searchForm": {
-    "message": "https://gl.wikipedia.org/wiki/Especial:Procurar?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://gl.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/gn/messages.json b/browser/components/search/extensions/wikipedia/_locales/gn/messages.json
deleted file mode 100644
index 5efc5ed74a95..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/gn/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Vikipetã (gn)"
-  },
-  "extensionDescription": {
-    "message": "Vikipetã, opaite tembikuaa hekosãsóva renda"
-  },
-  "searchUrl": {
-    "message": "https://gn.wikipedia.org/wiki/Mba'echĩchĩ:Buscar"
-  },
-  "searchForm": {
-    "message": "https://gn.wikipedia.org/wiki/Mba'echĩchĩ:Buscar?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://gn.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/gu/messages.json b/browser/components/search/extensions/wikipedia/_locales/gu/messages.json
deleted file mode 100644
index 3d2f68826fc5..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/gu/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "વિકિપીડિયા (gu)"
-  },
-  "extensionDescription": {
-    "message": "વીકીપીડિયા, મુક્ત એનસાયક્લોપીડિયા"
-  },
-  "searchUrl": {
-    "message": "https://gu.wikipedia.org/wiki/વિશેષ:શોધ";
-  },
-  "searchForm": {
-    "message": "https://gu.wikipedia.org/wiki/વિશેષ:શોધ?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://gu.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/he/messages.json b/browser/components/search/extensions/wikipedia/_locales/he/messages.json
deleted file mode 100644
index 1f8471e980f0..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/he/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "ויקיפדיה"
-  },
-  "extensionDescription": {
-    "message": "ויקיפדיה"
-  },
-  "searchUrl": {
-    "message": "https://he.wikipedia.org/wiki/מיוחד:חיפוש";
-  },
-  "searchForm": {
-    "message": "https://he.wikipedia.org/wiki/מיוחד:חיפוש?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://he.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/hi/messages.json b/browser/components/search/extensions/wikipedia/_locales/hi/messages.json
deleted file mode 100644
index f3b7d14eafa0..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/hi/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "विकिपीडिया (hi)"
-  },
-  "extensionDescription": {
-    "message": "विकिपीडिया (हिन्दी)"
-  },
-  "searchUrl": {
-    "message": "https://hi.wikipedia.org/wiki/विशेष:खोज";
-  },
-  "searchForm": {
-    "message": "https://hi.wikipedia.org/wiki/विशेष:खोज?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://hi.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/hr/messages.json b/browser/components/search/extensions/wikipedia/_locales/hr/messages.json
deleted file mode 100644
index 18a6177efcca..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/hr/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedija (hr)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedija, slobodna enciklopedija"
-  },
-  "searchUrl": {
-    "message": "https://hr.wikipedia.org/wiki/Posebno:Traži";
-  },
-  "searchForm": {
-    "message": "https://hr.wikipedia.org/wiki/Posebno:Traži?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://hr.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/hsb/messages.json b/browser/components/search/extensions/wikipedia/_locales/hsb/messages.json
deleted file mode 100644
index d4e62836e6e9..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/hsb/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedija (hsb)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedija, swobodna encyklopedija"
-  },
-  "searchUrl": {
-    "message": "https://hsb.wikipedia.org/wiki/Specialnje:Pytać";
-  },
-  "searchForm": {
-    "message": "https://hsb.wikipedia.org/wiki/Specialnje:Pytać?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://hsb.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/hu/messages.json b/browser/components/search/extensions/wikipedia/_locales/hu/messages.json
deleted file mode 100644
index 68300c48a6f3..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/hu/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipédia (hu)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, a szabad enciklopédia"
-  },
-  "searchUrl": {
-    "message": "https://hu.wikipedia.org/wiki/Speciális:Keresés";
-  },
-  "searchForm": {
-    "message": "https://hu.wikipedia.org/wiki/Speciális:Keresés?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://hu.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/hy/messages.json b/browser/components/search/extensions/wikipedia/_locales/hy/messages.json
deleted file mode 100644
index 56c2ae2c641b..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/hy/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (hy)"
-  },
-  "extensionDescription": {
-    "message": "Վիքիփեդիա՝ ազատ հանրագիտարան"
-  },
-  "searchUrl": {
-    "message": "https://hy.wikipedia.org/wiki/Սպասարկող:Որոնել";
-  },
-  "searchForm": {
-    "message": "https://hy.wikipedia.org/wiki/Սպասարկող:Որոնել?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://hy.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ia/messages.json b/browser/components/search/extensions/wikipedia/_locales/ia/messages.json
deleted file mode 100644
index 6d997ae8fc81..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ia/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (ia)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, le encyclopedia libere"
-  },
-  "searchUrl": {
-    "message": "https://ia.wikipedia.org/wiki/Special:Recerca";
-  },
-  "searchForm": {
-    "message": "https://ia.wikipedia.org/wiki/Special:Recerca?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://ia.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/id/messages.json b/browser/components/search/extensions/wikipedia/_locales/id/messages.json
deleted file mode 100644
index 1d35e71b956d..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/id/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (id)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, ensiklopedia bebas"
-  },
-  "searchUrl": {
-    "message": "https://id.wikipedia.org/wiki/Istimewa:Pencarian";
-  },
-  "searchForm": {
-    "message": "https://id.wikipedia.org/wiki/Istimewa:Pencarian?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://id.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/is/messages.json b/browser/components/search/extensions/wikipedia/_locales/is/messages.json
deleted file mode 100644
index f722d88187de..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/is/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (is)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, the free encyclopedia"
-  },
-  "searchUrl": {
-    "message": "https://is.wikipedia.org/wiki/Kerfissíða:Leit";
-  },
-  "searchForm": {
-    "message": "https://is.wikipedia.org/wiki/Kerfissíða:Leit?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://is.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/it/messages.json b/browser/components/search/extensions/wikipedia/_locales/it/messages.json
deleted file mode 100644
index 2ca645740f87..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/it/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (it)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, l'enciclopedia libera"
-  },
-  "searchUrl": {
-    "message": "https://it.wikipedia.org/wiki/Speciale:Ricerca";
-  },
-  "searchForm": {
-    "message": "https://it.wikipedia.org/wiki/Speciale:Ricerca?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://it.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ja/messages.json b/browser/components/search/extensions/wikipedia/_locales/ja/messages.json
deleted file mode 100644
index 7215e68768f0..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ja/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (ja)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia - フリー百科事典"
-  },
-  "searchUrl": {
-    "message": "https://ja.wikipedia.org/wiki/特別:検索";
-  },
-  "searchForm": {
-    "message": "https://ja.wikipedia.org/wiki/特別:検索?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://ja.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ka/messages.json b/browser/components/search/extensions/wikipedia/_locales/ka/messages.json
deleted file mode 100644
index c460a093e5e4..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ka/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "ვიკიპედია (ka)"
-  },
-  "extensionDescription": {
-    "message": "ვიკიპედია, თავისუფალი ენციკლოპედია"
-  },
-  "searchUrl": {
-    "message": "https://ka.wikipedia.org/wiki/სპეციალური:ძიება";
-  },
-  "searchForm": {
-    "message": "https://ka.wikipedia.org/wiki/სპეციალური:ძიება?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://ka.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/kab/messages.json b/browser/components/search/extensions/wikipedia/_locales/kab/messages.json
deleted file mode 100644
index 3cf743b616fe..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/kab/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (kab)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, tasanayt tilellit"
-  },
-  "searchUrl": {
-    "message": "https://kab.wikipedia.org/wiki/Uslig:Search";
-  },
-  "searchForm": {
-    "message": "https://kab.wikipedia.org/wiki/Uslig:Search?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://kab.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/kk/messages.json b/browser/components/search/extensions/wikipedia/_locales/kk/messages.json
deleted file mode 100644
index 0844cca0d7e1..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/kk/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Уикипедия (kk)"
-  },
-  "extensionDescription": {
-    "message": "Уикипедия (kk)"
-  },
-  "searchUrl": {
-    "message": "https://kk.wikipedia.org/wiki/Арнайы:Іздеу";
-  },
-  "searchForm": {
-    "message": "https://kk.wikipedia.org/wiki/Арнайы:Іздеу?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://kk.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/km/messages.json b/browser/components/search/extensions/wikipedia/_locales/km/messages.json
deleted file mode 100644
index 0f0a0880e188..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/km/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "វីគីភីឌា (km)"
-  },
-  "extensionDescription": {
-    "message": "វីគីភីឌា សព្វ​វចនា​ធិប្បាយ​សេរី"
-  },
-  "searchUrl": {
-    "message": "https://km.wikipedia.org/wiki/ពិសេស:ស្វែងរក";
-  },
-  "searchForm": {
-    "message": "https://km.wikipedia.org/wiki/ពិសេស:ស្វែងរក?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://km.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/kn/messages.json b/browser/components/search/extensions/wikipedia/_locales/kn/messages.json
deleted file mode 100644
index 379ef20085a3..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/kn/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (kn)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, the free encyclopedia"
-  },
-  "searchUrl": {
-    "message": "https://kn.wikipedia.org/wiki/ವಿಶೇಷ:Search";
-  },
-  "searchForm": {
-    "message": "https://kn.wikipedia.org/wiki/ವಿಶೇಷ:Search?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://kn.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/kr/messages.json b/browser/components/search/extensions/wikipedia/_locales/kr/messages.json
deleted file mode 100644
index 54296cac62bd..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/kr/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "위키백과 (ko)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, the free encyclopedia"
-  },
-  "searchUrl": {
-    "message": "https://ko.wikipedia.org/wiki/특수기능:찾기";
-  },
-  "searchForm": {
-    "message": "https://ko.wikipedia.org/wiki/특수기능:찾기?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://ko.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/lij/messages.json b/browser/components/search/extensions/wikipedia/_locales/lij/messages.json
deleted file mode 100644
index cb90db5e4099..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/lij/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (lij)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, l'enciclopedia libera"
-  },
-  "searchUrl": {
-    "message": "https://lij.wikipedia.org/wiki/Speçiale:Riçerca";
-  },
-  "searchForm": {
-    "message": "https://lij.wikipedia.org/wiki/Speçiale:Riçerca?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://lij.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/lo/messages.json b/browser/components/search/extensions/wikipedia/_locales/lo/messages.json
deleted file mode 100644
index 712746ec6316..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/lo/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "ວິກິພີເດຍ (lo)"
-  },
-  "extensionDescription": {
-    "message": "ວິກິພີເດຍ, ສາລານຸກົມເສລີ"
-  },
-  "searchUrl": {
-    "message": "https://lo.wikipedia.org/wiki/ພິເສດ:ຊອກຫາ";
-  },
-  "searchForm": {
-    "message": "https://lo.wikipedia.org/wiki/ພິເສດ:ຊອກຫາ?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://lo.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/lt/messages.json b/browser/components/search/extensions/wikipedia/_locales/lt/messages.json
deleted file mode 100644
index c061bcc5224c..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/lt/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (lt)"
-  },
-  "extensionDescription": {
-    "message": "Vikipedija, laisvoji enciklopedija"
-  },
-  "searchUrl": {
-    "message": "https://lt.wikipedia.org/wiki/Specialus:Paieška";
-  },
-  "searchForm": {
-    "message": "https://lt.wikipedia.org/wiki/Specialus:Paieška?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://lt.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ltg/messages.json b/browser/components/search/extensions/wikipedia/_locales/ltg/messages.json
deleted file mode 100644
index 0e02810ef3bf..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ltg/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Vikipedeja (ltg)"
-  },
-  "extensionDescription": {
-    "message": "Vikipēdija, breivuo eņciklopedeja"
-  },
-  "searchUrl": {
-    "message": "https://ltg.wikipedia.org/wiki/Seviškuo:Search";
-  },
-  "searchForm": {
-    "message": "https://ltg.wikipedia.org/wiki/Seviškuo:Search?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://ltg.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/lv/messages.json b/browser/components/search/extensions/wikipedia/_locales/lv/messages.json
deleted file mode 100644
index f73814b8574f..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/lv/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Vikipēdija"
-  },
-  "extensionDescription": {
-    "message": "Vikipēdija, brīvā enciklopēdija"
-  },
-  "searchUrl": {
-    "message": "https://lv.wikipedia.org/wiki/Special:Search";
-  },
-  "searchForm": {
-    "message": "https://lv.wikipedia.org/wiki/Special:Search?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://lv.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/mk/messages.json b/browser/components/search/extensions/wikipedia/_locales/mk/messages.json
deleted file mode 100644
index de7e06e1ac4a..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/mk/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Википедија (mk)"
-  },
-  "extensionDescription": {
-    "message": "Википедија, слободната енциклопедија"
-  },
-  "searchUrl": {
-    "message": "https://mk.wikipedia.org/wiki/Специјална:Барај";
-  },
-  "searchForm": {
-    "message": "https://mk.wikipedia.org/wiki/Специјална:Барај?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://mk.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/mr/messages.json b/browser/components/search/extensions/wikipedia/_locales/mr/messages.json
deleted file mode 100644
index bd46dd83700c..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/mr/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "विकिपीडिया (mr)"
-  },
-  "extensionDescription": {
-    "message": "विकिपीडिया, मोफत माहितीकोष"
-  },
-  "searchUrl": {
-    "message": "https://mr.wikipedia.org/wiki/विशेष:शोधा";
-  },
-  "searchForm": {
-    "message": "https://mr.wikipedia.org/wiki/विशेष:शोधा?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://mr.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ms/messages.json b/browser/components/search/extensions/wikipedia/_locales/ms/messages.json
deleted file mode 100644
index c817e82c7821..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ms/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (ms)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, ensiklopedia bebas"
-  },
-  "searchUrl": {
-    "message": "https://ms.wikipedia.org/wiki/Khas:Gelintar";
-  },
-  "searchForm": {
-    "message": "https://ms.wikipedia.org/wiki/Khas:Gelintar?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://ms.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/my/messages.json b/browser/components/search/extensions/wikipedia/_locales/my/messages.json
deleted file mode 100644
index 62342d1b90ae..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/my/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (my)"
-  },
-  "extensionDescription": {
-    "message": "အခမဲ့လွတ်လပ်စွယ်စုံကျမ်း"
-  },
-  "searchUrl": {
-    "message": "https://my.wikipedia.org/wiki/Special:Search";
-  },
-  "searchForm": {
-    "message": "https://my.wikipedia.org/wiki/Special:Search?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://my.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ne/messages.json b/browser/components/search/extensions/wikipedia/_locales/ne/messages.json
deleted file mode 100644
index eb22344341e4..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ne/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "विकिपीडिया (ne)"
-  },
-  "extensionDescription": {
-    "message": "विकिपिडिया एक स्वतन्त्र विश्वकोष"
-  },
-  "searchUrl": {
-    "message": "https://ne.wikipedia.org/wiki/विशेष:Search";
-  },
-  "searchForm": {
-    "message": "https://ne.wikipedia.org/wiki/विशेष:Search?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://ne.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/nl/messages.json b/browser/components/search/extensions/wikipedia/_locales/nl/messages.json
deleted file mode 100644
index c2a810c2ae30..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/nl/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (nl)"
-  },
-  "extensionDescription": {
-    "message": "De vrije encyclopedie"
-  },
-  "searchUrl": {
-    "message": "https://nl.wikipedia.org/wiki/Speciaal:Zoeken";
-  },
-  "searchForm": {
-    "message": "https://nl.wikipedia.org/wiki/Speciaal:Zoeken?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://nl.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/oc/messages.json b/browser/components/search/extensions/wikipedia/_locales/oc/messages.json
deleted file mode 100644
index 3cadc3d68f07..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/oc/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipèdia (oc)"
-  },
-  "extensionDescription": {
-    "message": "Wikipèdia, l'enciclopèdia liura"
-  },
-  "searchUrl": {
-    "message": "https://oc.wikipedia.org/wiki/Especial:Recèrca";
-  },
-  "searchForm": {
-    "message": "https://oc.wikipedia.org/wiki/Especial:Recèrca?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://oc.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/pa/messages.json b/browser/components/search/extensions/wikipedia/_locales/pa/messages.json
deleted file mode 100644
index dff38c2146fd..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/pa/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (pa)"
-  },
-  "extensionDescription": {
-    "message": "ਵਿਕਿਪੀਡਿਆ, ਮੁਫ਼ਤ/ਮੁਕਤ ਸ਼ਬਦਕੋਸ਼"
-  },
-  "searchUrl": {
-    "message": "https://pa.wikipedia.org/wiki/ਖ਼ਾਸ:ਖੋਜੋ";
-  },
-  "searchForm": {
-    "message": "https://pa.wikipedia.org/wiki/ਖ਼ਾਸ:ਖੋਜੋ?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://pa.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/pl/messages.json b/browser/components/search/extensions/wikipedia/_locales/pl/messages.json
deleted file mode 100644
index 315aa0d9cbe1..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/pl/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (pl)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, wolna encyklopedia"
-  },
-  "searchUrl": {
-    "message": "https://pl.wikipedia.org/wiki/Specjalna:Szukaj";
-  },
-  "searchForm": {
-    "message": "https://pl.wikipedia.org/wiki/Specjalna:Szukaj?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://pl.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/pt/messages.json b/browser/components/search/extensions/wikipedia/_locales/pt/messages.json
deleted file mode 100644
index 4beaa97acc88..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/pt/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (pt)"
-  },
-  "extensionDescription": {
-    "message": "Wikipédia, a enciclopédia livre"
-  },
-  "searchUrl": {
-    "message": "https://pt.wikipedia.org/wiki/Especial:Pesquisar";
-  },
-  "searchForm": {
-    "message": "https://pt.wikipedia.org/wiki/Especial:Pesquisar?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://pt.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/rm/messages.json b/browser/components/search/extensions/wikipedia/_locales/rm/messages.json
deleted file mode 100644
index 8258d5e43451..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/rm/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (rm)"
-  },
-  "extensionDescription": {
-    "message": "Vichipedia, l'enciclopedia libra"
-  },
-  "searchUrl": {
-    "message": "https://rm.wikipedia.org/wiki/Spezial:Search";
-  },
-  "searchForm": {
-    "message": "https://rm.wikipedia.org/wiki/Spezial:Search?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://rm.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ro/messages.json b/browser/components/search/extensions/wikipedia/_locales/ro/messages.json
deleted file mode 100644
index 48865fd547e4..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ro/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (ro)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, enciclopedia liberă"
-  },
-  "searchUrl": {
-    "message": "https://ro.wikipedia.org/wiki/Special:Căutare";
-  },
-  "searchForm": {
-    "message": "https://ro.wikipedia.org/wiki/Special:Căutare?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://ro.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ru/messages.json b/browser/components/search/extensions/wikipedia/_locales/ru/messages.json
deleted file mode 100644
index 569467691d7c..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ru/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Википедия (ru)"
-  },
-  "extensionDescription": {
-    "message": "Википедия, свободная энциклопедия"
-  },
-  "searchUrl": {
-    "message": "https://ru.wikipedia.org/wiki/Служебная:Поиск";
-  },
-  "searchForm": {
-    "message": "https://ru.wikipedia.org/wiki/Служебная:Поиск?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://ru.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/si/messages.json b/browser/components/search/extensions/wikipedia/_locales/si/messages.json
deleted file mode 100644
index 0406ae728d71..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/si/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (si)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, the free encyclopedia"
-  },
-  "searchUrl": {
-    "message": "https://si.wikipedia.org/wiki/විශේෂ:ගවේෂණය";
-  },
-  "searchForm": {
-    "message": "https://si.wikipedia.org/wiki/විශේෂ:ගවේෂණය?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://si.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/sk/messages.json b/browser/components/search/extensions/wikipedia/_locales/sk/messages.json
deleted file mode 100644
index 5c2f75f8b031..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/sk/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipédia (sk)"
-  },
-  "extensionDescription": {
-    "message": "Wikipédia, slobodná a otvorená encyklopédia"
-  },
-  "searchUrl": {
-    "message": "https://sk.wikipedia.org/wiki/Špeciálne:Hľadanie";
-  },
-  "searchForm": {
-    "message": "https://sk.wikipedia.org/wiki/Špeciálne:Hľadanie?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://sk.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/sl/messages.json b/browser/components/search/extensions/wikipedia/_locales/sl/messages.json
deleted file mode 100644
index 7385a2203474..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/sl/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedija (sl)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedija, prosta enciklopedija"
-  },
-  "searchUrl": {
-    "message": "https://sl.wikipedia.org/wiki/Posebno:Iskanje";
-  },
-  "searchForm": {
-    "message": "https://sl.wikipedia.org/wiki/Posebno:Iskanje?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://sl.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/sq/messages.json b/browser/components/search/extensions/wikipedia/_locales/sq/messages.json
deleted file mode 100644
index 68361d8ab294..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/sq/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (sq)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, enciklopedia e lirë"
-  },
-  "searchUrl": {
-    "message": "https://sq.wikipedia.org/wiki/Speciale:Kërkim";
-  },
-  "searchForm": {
-    "message": "https://sq.wikipedia.org/wiki/Speciale:Kërkim?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://sq.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/sr/messages.json b/browser/components/search/extensions/wikipedia/_locales/sr/messages.json
deleted file mode 100644
index 50ebc0a197a1..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/sr/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Википедија (sr)"
-  },
-  "extensionDescription": {
-    "message": "Претрага Википедије на српском језику"
-  },
-  "searchUrl": {
-    "message": "https://sr.wikipedia.org/wiki/Посебно:Претражи";
-  },
-  "searchForm": {
-    "message": "https://sr.wikipedia.org/wiki/Посебно:Претражи?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://sr.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/sv-SE/messages.json b/browser/components/search/extensions/wikipedia/_locales/sv-SE/messages.json
deleted file mode 100644
index 1edc3db80d98..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/sv-SE/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (sv)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, den fria encyklopedin"
-  },
-  "searchUrl": {
-    "message": "https://sv.wikipedia.org/wiki/Special:Sök";
-  },
-  "searchForm": {
-    "message": "https://sv.wikipedia.org/wiki/Special:Sök?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://sv.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ta/messages.json b/browser/components/search/extensions/wikipedia/_locales/ta/messages.json
deleted file mode 100644
index 54397603b028..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ta/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "விக்கிப்பீடியா (ta)"
-  },
-  "extensionDescription": {
-    "message": "விக்கிப்பீடியா (ta)"
-  },
-  "searchUrl": {
-    "message": "https://ta.wikipedia.org/wiki/சிறப்பு:Search";
-  },
-  "searchForm": {
-    "message": "https://ta.wikipedia.org/wiki/சிறப்பு:Search?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://ta.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/te/messages.json b/browser/components/search/extensions/wikipedia/_locales/te/messages.json
deleted file mode 100644
index c474be12a76f..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/te/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "వికీపీడియా (te)"
-  },
-  "extensionDescription": {
-    "message": "వికీపీడియా (te)"
-  },
-  "searchUrl": {
-    "message": "https://te.wikipedia.org/wiki/ప్రత్యేక:అన్వేషణ";
-  },
-  "searchForm": {
-    "message": "https://te.wikipedia.org/wiki/ప్రత్యేక:అన్వేషణ?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://te.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/th/messages.json b/browser/components/search/extensions/wikipedia/_locales/th/messages.json
deleted file mode 100644
index 3d6aeb07ca2c..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/th/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "วิกิพีเดีย"
-  },
-  "extensionDescription": {
-    "message": "วิกิพีเดีย สารานุกรมเสรี"
-  },
-  "searchUrl": {
-    "message": "https://th.wikipedia.org/wiki/พิเศษ:ค้นหา";
-  },
-  "searchForm": {
-    "message": "https://th.wikipedia.org/wiki/พิเศษ:ค้นหา?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://th.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/tl/messages.json b/browser/components/search/extensions/wikipedia/_locales/tl/messages.json
deleted file mode 100644
index d55b03131f97..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/tl/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (tl)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, ang malayang ensiklopedya"
-  },
-  "searchUrl": {
-    "message": "https://tl.wikipedia.org/wiki/Natatangi:Maghanap";
-  },
-  "searchForm": {
-    "message": "https://tl.wikipedia.org/wiki/Natatangi:Maghanap?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://tl.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/tr/messages.json b/browser/components/search/extensions/wikipedia/_locales/tr/messages.json
deleted file mode 100644
index 878b28ab68b2..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/tr/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (tr)"
-  },
-  "extensionDescription": {
-    "message": "Vikipedi, özgür ansiklopedi"
-  },
-  "searchUrl": {
-    "message": "https://tr.wikipedia.org/wiki/Özel:Ara";
-  },
-  "searchForm": {
-    "message": "https://tr.wikipedia.org/wiki/Özel:Ara?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://tr.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/uk/messages.json b/browser/components/search/extensions/wikipedia/_locales/uk/messages.json
deleted file mode 100644
index 2749b86304bf..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/uk/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Вікіпедія (uk)"
-  },
-  "extensionDescription": {
-    "message": "Вікіпедія, вільна енциклопедія"
-  },
-  "searchUrl": {
-    "message": "https://uk.wikipedia.org/wiki/Спеціальна:Пошук";
-  },
-  "searchForm": {
-    "message": "https://uk.wikipedia.org/wiki/Спеціальна:Пошук?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://uk.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ur/messages.json b/browser/components/search/extensions/wikipedia/_locales/ur/messages.json
deleted file mode 100644
index dcc87e0c853c..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ur/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "ویکیپیڈیا (ur)"
-  },
-  "extensionDescription": {
-    "message": "ویکیپیڈیا آزاد دائرۃ المعارف"
-  },
-  "searchUrl": {
-    "message": "https://ur.wikipedia.org/wiki/خاص:تلاش";
-  },
-  "searchForm": {
-    "message": "https://ur.wikipedia.org/wiki/خاص:تلاش?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://ur.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/uz/messages.json b/browser/components/search/extensions/wikipedia/_locales/uz/messages.json
deleted file mode 100644
index 89a8f2a89bca..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/uz/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Vikipediya (uz)"
-  },
-  "extensionDescription": {
-    "message": "Vikipediya, ochiq ensiklopediya"
-  },
-  "searchUrl": {
-    "message": "https://uz.wikipedia.org/wiki/Maxsus:Search";
-  },
-  "searchForm": {
-    "message": "https://uz.wikipedia.org/wiki/Maxsus:Search?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://uz.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/vi/messages.json b/browser/components/search/extensions/wikipedia/_locales/vi/messages.json
deleted file mode 100644
index c0844e4feb14..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/vi/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (vi)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, bách khoa toàn thư mở"
-  },
-  "searchUrl": {
-    "message": "https://vi.wikipedia.org/wiki/Đặc_biệt:Tìm_kiếm";
-  },
-  "searchForm": {
-    "message": "https://vi.wikipedia.org/wiki/Đặc_biệt:Tìm_kiếm?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://vi.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/wo/messages.json b/browser/components/search/extensions/wikipedia/_locales/wo/messages.json
deleted file mode 100644
index 7efde3b1d0f4..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/wo/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (wo)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, Jimbulang bu Ubbeeku bi"
-  },
-  "searchUrl": {
-    "message": "https://wo.wikipedia.org/wiki/Jagleel:Ceet";
-  },
-  "searchForm": {
-    "message": "https://wo.wikipedia.org/wiki/Jagleel:Ceet?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://wo.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/zh-CN/messages.json b/browser/components/search/extensions/wikipedia/_locales/zh-CN/messages.json
deleted file mode 100644
index 29047565a243..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/zh-CN/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "维基百科"
-  },
-  "extensionDescription": {
-    "message": "维基百科,自由的百科全书"
-  },
-  "searchUrl": {
-    "message": "https://zh.wikipedia.org/wiki/Special:搜索";
-  },
-  "searchForm": {
-    "message": "https://zh.wikipedia.org/wiki/Special:搜索?search={searchTerms}&sourceid=Mozilla-search";
-  },
-  "suggestUrl": {
-    "message": "https://zh.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/zh-TW/messages.json b/browser/components/search/extensions/wikipedia/_locales/zh-TW/messages.json
deleted file mode 100644
index a0e8d880ea26..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/zh-TW/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (zh)"
-  },
-  "extensionDescription": {
-    "message": "維基百科,自由的百科全書"
-  },
-  "searchUrl": {
-    "message": "https://zh.wikipedia.org/wiki/Special:搜索";
-  },
-  "searchForm": {
-    "message": "https://zh.wikipedia.org/wiki/Special:搜索?search={searchTerms}&sourceid=Mozilla-search&variant=zh-tw";
-  },
-  "suggestUrl": {
-    "message": "https://zh.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search&variant=zh-tw"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/manifest.json b/browser/components/search/extensions/wikipedia/manifest.json
index cd95d3aa9e1c..0af3b2a1c211 100644
--- a/browser/components/search/extensions/wikipedia/manifest.json
+++ b/browser/components/search/extensions/wikipedia/manifest.json
@@ -1,6 +1,6 @@
 {
-  "name": "__MSG_extensionName__",
-  "description": "__MSG_extensionDescription__",
+  "name": "Wikipedia (en)",
+  "description": "Wikipedia, the Free Encyclopedia",
   "manifest_version": 2,
   "version": "1.1",
   "applications": {
@@ -9,7 +9,6 @@
     }
   },
   "hidden": true,
-  "default_locale": "en",
   "icons": {
     "16": "favicon.ico"
   },
@@ -19,11 +18,11 @@
   "chrome_settings_overrides": {
     "search_provider": {
       "keyword": "@wikipedia",
-      "name": "__MSG_extensionName__",
-      "search_url": "__MSG_searchUrl__",
-      "search_form": "__MSG_searchForm__",
-      "suggest_url": "__MSG_suggestUrl__",
-      "search_url_get_params": "__MSG_searchUrlGetParams__"
+      "name": "Wikipedia (en)",
+      "search_url": "https://en.wikipedia.org/wiki/Special:Search";,
+      "search_form": "https://en.wikipedia.org/wiki/Special:Search?search={searchTerms}&sourceid=Mozilla-search";,
+      "suggest_url": "https://en.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}";,
+      "search_url_get_params": "search={searchTerms}&sourceid=Mozilla-search"
     }
   }
 }
diff --git a/browser/components/search/extensions/yahoo/favicon.ico b/browser/components/search/extensions/yahoo/favicon.ico
new file mode 100644
index 000000000000..9bd1d9f7c008
Binary files /dev/null and b/browser/components/search/extensions/yahoo/favicon.ico differ
diff --git a/browser/components/search/extensions/yahoo/manifest.json b/browser/components/search/extensions/yahoo/manifest.json
new file mode 100644
index 000000000000..e1f04a373c2e
--- /dev/null
+++ b/browser/components/search/extensions/yahoo/manifest.json
@@ -0,0 +1,28 @@
+{
+  "name": "Yahoo",
+  "description": "Yahoo Search",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "yahoo@xxxxxxxxxxxxxxxxxx"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Yahoo",
+      "search_url": "https://search.yahoo.com/yhs/search";,
+      "search_form": "https://search.yahoo.com/yhs/search?p={searchTerms}&ei=UTF-8&hspart=mozilla";,
+      "search_url_get_params": "p={searchTerms}&ei=UTF-8&hspart=mozilla",
+      "suggest_url": "https://search.yahoo.com/sugg/ff";,
+      "suggest_url_get_params": "output=fxjson&appid=ffd&command={searchTerms}"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/youtube/favicon.ico b/browser/components/search/extensions/youtube/favicon.ico
new file mode 100644
index 000000000000..977887dbbb84
Binary files /dev/null and b/browser/components/search/extensions/youtube/favicon.ico differ
diff --git a/browser/components/search/extensions/youtube/manifest.json b/browser/components/search/extensions/youtube/manifest.json
new file mode 100644
index 000000000000..6fbf8745bac2
--- /dev/null
+++ b/browser/components/search/extensions/youtube/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "YouTube",
+  "description": "YouTube - Videos",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "youtube@xxxxxxxxxxxxxxxxxx"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "YouTube",
+      "search_url": "https://www.youtube.com/results?search_query={searchTerms}&search=Search";,
+      "search_form": "https://www.youtube.com/index";,
+      "suggest_url": "https://suggestqueries.google.com/complete/search?output=firefox&ds=yt&q={searchTerms}";
+    }
+  }
+}
\ No newline at end of file
diff --git a/tbb-tests/browser_tor_omnibox.js b/tbb-tests/browser_tor_omnibox.js
new file mode 100644
index 000000000000..3bb90f51a305
--- /dev/null
+++ b/tbb-tests/browser_tor_omnibox.js
@@ -0,0 +1,20 @@
+// # Test Tor Omnibox
+// Check what search engines are installed in the search box.
+
+add_task(async function() {
+  // Grab engine IDs.
+  let browserSearchService = Components.classes["@mozilla.org/browser/search-service;1"]
+                             .getService(Components.interfaces.nsISearchService),
+      engineIDs = (await browserSearchService.getEngines()).map(e => e.identifier);
+
+  // Check that we have the correct engines installed, in the right order.
+  is(engineIDs[0], "ddg", "Default search engine is duckduckgo");
+  is(engineIDs[1], "youtube", "Secondary search engine is youtube");
+  is(engineIDs[2], "google", "Google is third search engine");
+  is(engineIDs[3], "blockchair", "Blockchair is fourth search engine");
+  is(engineIDs[4], "ddg-onion", "Duck Duck Go Onion is fifth search engine");
+  is(engineIDs[5], "startpage", "Startpage is sixth search engine");
+  is(engineIDs[6], "twitter", "Twitter is sixth search engine");
+  is(engineIDs[7], "wikipedia", "Wikipedia is seventh search engine");
+  is(engineIDs[8], "yahoo", "Yahoo is eighth search engine");
+});
diff --git a/toolkit/components/search/SearchService.jsm b/toolkit/components/search/SearchService.jsm
index 9ac351a248b7..5094ce8aec9e 100644
--- a/toolkit/components/search/SearchService.jsm
+++ b/toolkit/components/search/SearchService.jsm
@@ -12,14 +12,12 @@ const { PromiseUtils } = ChromeUtils.import(
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  AppConstants: "resource://gre/modules/AppConstants.jsm",
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   IgnoreLists: "resource://gre/modules/IgnoreLists.jsm",
   OpenSearchEngine: "resource://gre/modules/OpenSearchEngine.jsm",
   Region: "resource://gre/modules/Region.jsm",
   RemoteSettings: "resource://services-settings/remote-settings.js",
   SearchEngine: "resource://gre/modules/SearchEngine.jsm",
-  SearchEngineSelector: "resource://gre/modules/SearchEngineSelector.jsm",
   SearchSettings: "resource://gre/modules/SearchSettings.jsm",
   SearchStaticData: "resource://gre/modules/SearchStaticData.jsm",
   SearchUtils: "resource://gre/modules/SearchUtils.jsm",
@@ -239,11 +237,6 @@ SearchService.prototype = {
     Services.obs.addObserver(this, Region.REGION_TOPIC);
 
     try {
-      // Create the search engine selector.
-      this._engineSelector = new SearchEngineSelector(
-        this._handleConfigurationUpdated.bind(this)
-      );
-
       // See if we have a settings file so we don't have to parse a bunch of XML.
       let settings = await this._settings.get();
 
@@ -1164,26 +1157,21 @@ SearchService.prototype = {
   },
 
   async _fetchEngineSelectorEngines() {
-    let searchEngineSelectorProperties = {
-      locale: Services.locale.appLocaleAsBCP47,
-      region: Region.home || "default",
-      channel: AppConstants.MOZ_APP_VERSION_DISPLAY.endsWith("esr")
-        ? "esr"
-        : AppConstants.MOZ_UPDATE_CHANNEL,
-      experiment: NimbusFeatures.search.getVariable("experiment") ?? "",
-      distroID: SearchUtils.distroID ?? "",
-    };
-
-    for (let [key, value] of Object.entries(searchEngineSelectorProperties)) {
-      this._settings.setAttribute(key, value);
-    }
-
-    let {
-      engines,
-      privateDefault,
-    } = await this._engineSelector.fetchEngineConfiguration(
-      searchEngineSelectorProperties
-    );
+    const engines = [
+      { webExtension: { id: "ddg@xxxxxxxxxxxxxxxxxx" }, orderHint: 100 },
+      { webExtension: { id: "youtube@xxxxxxxxxxxxxxxxxx" }, orderHint: 90 },
+      { webExtension: { id: "google@xxxxxxxxxxxxxxxxxx" }, orderHint: 80 },
+      { webExtension: { id: "blockchair@xxxxxxxxxxxxxxxxxx" }, orderHint: 70 },
+      { webExtension: { id: "ddg-onion@xxxxxxxxxxxxxxxxxx" }, orderHint: 60 },
+      {
+        webExtension: { id: "blockchair-onion@xxxxxxxxxxxxxxxxxx" },
+        orderHint: 50,
+      },
+      { webExtension: { id: "startpage@xxxxxxxxxxxxxxxxxx" }, orderHint: 40 },
+      { webExtension: { id: "twitter@xxxxxxxxxxxxxxxxxx" }, orderHint: 30 },
+      { webExtension: { id: "wikipedia@xxxxxxxxxxxxxxxxxx" }, orderHint: 20 },
+      { webExtension: { id: "yahoo@xxxxxxxxxxxxxxxxxx" }, orderHint: 10 },
+    ];
 
     for (let e of engines) {
       if (!e.webExtension) {
@@ -1192,7 +1180,7 @@ SearchService.prototype = {
       e.webExtension.locale = e.webExtension?.locale ?? SearchUtils.DEFAULT_TAG;
     }
 
-    return { engines, privateDefault };
+    return { engines, privateDefault: undefined };
   },
 
   _setDefaultAndOrdersFromSelector(engines, privateDefault) {
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 7d8bc93933bf..ed2288a8939d 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -972,6 +972,12 @@ var BuiltInLocation = new (class _BuiltInLocation extends XPIStateLocation {
   isLinkedAddon(/* aId */) {
     return false;
   }
+
+  restore(saved) {
+    super.restore(saved);
+    // Bug 33342: avoid restoring disconnect addon from addonStartup.json.lz4.
+    this.removeAddon("disconnect@xxxxxxxxxxxxxxxxxx");
+  }
 })();
 
 /**

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits