246 files changed, 4384 insertions, 0 deletions
diff --git a/browser/components/search/extensions/1und1/favicon.ico b/browser/components/search/extensions/1und1/favicon.ico
new file mode 100644
index 0000000000..ac5a2bbb0a
--- /dev/null
+++ b/browser/components/search/extensions/1und1/favicon.ico
diff --git a/browser/components/search/extensions/1und1/manifest.json b/browser/components/search/extensions/1und1/manifest.json
new file mode 100644
index 0000000000..4b8dab38fc
--- /dev/null
+++ b/browser/components/search/extensions/1und1/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "1&1 Suche",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "1und1@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "1&1 Suche",
+      "search_url": "https://go.1und1.de/br/moz_search_web/",
+      "search_url_get_params": "q={searchTerms}&enc=UTF-8",
+      "suggest_url": "https://suggestplugin.ui-portal.de/s",
+      "suggest_url_get_params": "q={searchTerms}&brand=1und1&origin=br_splugin_ff_sg"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/allegro-pl/favicon.ico b/browser/components/search/extensions/allegro-pl/favicon.ico
new file mode 100644
index 0000000000..42b4f90149
--- /dev/null
+++ b/browser/components/search/extensions/allegro-pl/favicon.ico
diff --git a/browser/components/search/extensions/allegro-pl/manifest.json b/browser/components/search/extensions/allegro-pl/manifest.json
new file mode 100644
index 0000000000..bafa3e8e6e
--- /dev/null
+++ b/browser/components/search/extensions/allegro-pl/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Allegro",
+  "description": "Wyszukiwanie w aukcjach Allegro",
+  "manifest_version": 2,
+  "version": "1.2",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "allegro-pl@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Allegro",
+      "search_url": "https://allegro.pl/listing",
+      "search_form": "https://allegro.pl",
+      "search_url_get_params": "string={searchTerms}&sourceid=Mozilla-search"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/amazon/_locales/au/messages.json b/browser/components/search/extensions/amazon/_locales/au/messages.json
new file mode 100644
index 0000000000..4e39901e99
--- /dev/null
+++ b/browser/components/search/extensions/amazon/_locales/au/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Amazon.com.au"
+  },
+  "extensionDescription": {
+    "message": "Amazon.com.au Search"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.com.au/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.com.au/exec/obidos/external-search/?field-keywords={searchTerms}&ie={inputEncoding}&mode=blended"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended"
+  },
+  "suggestUrl": {
+    "message": "https://completion.amazon.com.au/search/complete"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&search-alias=aps&mkt=111172"
+  }
+}
diff --git a/browser/components/search/extensions/amazon/_locales/ca/messages.json b/browser/components/search/extensions/amazon/_locales/ca/messages.json
new file mode 100644
index 0000000000..061188506b
--- /dev/null
+++ b/browser/components/search/extensions/amazon/_locales/ca/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Amazon.ca"
+  },
+  "extensionDescription": {
+    "message": "Amazon.ca Search"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.ca/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.ca/exec/obidos/external-search/?field-keywords={searchTerms}&ie={inputEncoding}&mode=blended"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozillacanada-20&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://completion.amazon.ca/search/complete"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&search-alias=aps&mkt=7"
+  }
+}
diff --git a/browser/components/search/extensions/amazon/_locales/de-adm/messages.json b/browser/components/search/extensions/amazon/_locales/de-adm/messages.json
new file mode 100644
index 0000000000..eb3ff200b2
--- /dev/null
+++ b/browser/components/search/extensions/amazon/_locales/de-adm/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Amazon.de"
+  },
+  "extensionDescription": {
+    "message": "Amazon.de Suche"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.de/s"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.de/"
+  },
+  "searchUrlGetParams": {
+    "message": "tag=admpdesktopde-21&ref=pd_sl_aDAC36B6C384A213{moz:date}&k={searchTerms}"
+  },
+  "suggestUrl": {
+    "message": "https://completion.amazon.de/search/complete"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&search-alias=aps&mkt=4"
+  }
+}
diff --git a/browser/components/search/extensions/amazon/_locales/de/messages.json b/browser/components/search/extensions/amazon/_locales/de/messages.json
new file mode 100644
index 0000000000..7df52a1d0d
--- /dev/null
+++ b/browser/components/search/extensions/amazon/_locales/de/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Amazon.de"
+  },
+  "extensionDescription": {
+    "message": "Amazon.de Suche"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.de/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.de/"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefox-de-21&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://completion.amazon.de/search/complete"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&search-alias=aps&mkt=4"
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/amazon/_locales/en-GB-adm/messages.json b/browser/components/search/extensions/amazon/_locales/en-GB-adm/messages.json
new file mode 100644
index 0000000000..737f51e2ca
--- /dev/null
+++ b/browser/components/search/extensions/amazon/_locales/en-GB-adm/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Amazon.co.uk"
+  },
+  "extensionDescription": {
+    "message": "Amazon.co.uk Search"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.co.uk/s"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.co.uk/"
+  },
+  "searchUrlGetParams": {
+    "message": "tag=admpdesktopuk-21&ref=pd_sl_a0D7C4FF8CC4AA12{moz:date}&k={searchTerms}"
+  },
+  "suggestUrl": {
+    "message": "https://completion.amazon.co.uk/search/complete"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&search-alias=aps&mkt=3"
+  }
+}
diff --git a/browser/components/search/extensions/amazon/_locales/en-GB/messages.json b/browser/components/search/extensions/amazon/_locales/en-GB/messages.json
new file mode 100644
index 0000000000..baa1ef845c
--- /dev/null
+++ b/browser/components/search/extensions/amazon/_locales/en-GB/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Amazon.co.uk"
+  },
+  "extensionDescription": {
+    "message": "Amazon.co.uk Search"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.co.uk/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.co.uk/"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefox-uk-21&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://completion.amazon.co.uk/search/complete"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&search-alias=aps&mkt=3"
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/amazon/_locales/france/messages.json b/browser/components/search/extensions/amazon/_locales/france/messages.json
new file mode 100644
index 0000000000..596712054b
--- /dev/null
+++ b/browser/components/search/extensions/amazon/_locales/france/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Amazon.fr"
+  },
+  "extensionDescription": {
+    "message": "Recherche Amazon.fr"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.fr/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.fr/"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefox-fr-21&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://completion.amazon.fr/search/complete"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&search-alias=aps&mkt=5"
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/amazon/_locales/in/messages.json b/browser/components/search/extensions/amazon/_locales/in/messages.json
new file mode 100644
index 0000000000..1fb6a1f429
--- /dev/null
+++ b/browser/components/search/extensions/amazon/_locales/in/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Amazon.in"
+  },
+  "extensionDescription": {
+    "message": "Amazon.in Search"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.in/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.in/"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://completion.amazon.in/search/complete"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&search-alias=aps&mkt=44571"
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/amazon/_locales/it/messages.json b/browser/components/search/extensions/amazon/_locales/it/messages.json
new file mode 100644
index 0000000000..4ef870f2e1
--- /dev/null
+++ b/browser/components/search/extensions/amazon/_locales/it/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Amazon.it"
+  },
+  "extensionDescription": {
+    "message": "Ricerca Amazon.it"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.it/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.it/"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefoxit-21&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://completion.amazon.it/search/complete"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&search-alias=aps&mkt=35691"
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/amazon/_locales/jp/messages.json b/browser/components/search/extensions/amazon/_locales/jp/messages.json
new file mode 100644
index 0000000000..a559d08161
--- /dev/null
+++ b/browser/components/search/extensions/amazon/_locales/jp/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Amazon.co.jp"
+  },
+  "extensionDescription": {
+    "message": "Amazon.co.jp Search"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.co.jp/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.co.jp/"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&mode=blended&tag=mozillajapan-fx-22&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://completion.amazon.co.jp/search/complete"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&search-alias=aps&mkt=6"
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/amazon/_locales/nl/messages.json b/browser/components/search/extensions/amazon/_locales/nl/messages.json
new file mode 100644
index 0000000000..17e5330df6
--- /dev/null
+++ b/browser/components/search/extensions/amazon/_locales/nl/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Amazon.nl"
+  },
+  "extensionDescription": {
+    "message": "Amazon.nl Search"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.nl/gp/search"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.nl/"
+  },
+  "searchUrlGetParams": {
+    "message": "ie={inputEncoding}&tag=mozillanether-21&index=aps&keywords={searchTerms}"
+  },
+  "suggestUrl": {
+    "message": "https://completion.amazon.nl/search/complete"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&search-alias=aps&mkt=328451"
+  }
+}
diff --git a/browser/components/search/extensions/amazon/_locales/spain/messages.json b/browser/components/search/extensions/amazon/_locales/spain/messages.json
new file mode 100644
index 0000000000..932b16c2f1
--- /dev/null
+++ b/browser/components/search/extensions/amazon/_locales/spain/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Amazon.es"
+  },
+  "extensionDescription": {
+    "message": "Amazon.es"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.es/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.es/"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozillaspain-21&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://completion.amazon.es/search/complete"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&search-alias=aps&mkt=44551"
+  }
+}
diff --git a/browser/components/search/extensions/amazon/_locales/sweden/messages.json b/browser/components/search/extensions/amazon/_locales/sweden/messages.json
new file mode 100644
index 0000000000..91cce43cf3
--- /dev/null
+++ b/browser/components/search/extensions/amazon/_locales/sweden/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Amazon.se"
+  },
+  "extensionDescription": {
+    "message": "Amazon.se"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.se/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.se/"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozillasweede-21&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://completion.amazon.se/search/complete"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&search-alias=aps&mkt=704403121"
+  }
+}
diff --git a/browser/components/search/extensions/amazon/favicon.ico b/browser/components/search/extensions/amazon/favicon.ico
new file mode 100644
index 0000000000..1c39eaf8fe
--- /dev/null
+++ b/browser/components/search/extensions/amazon/favicon.ico
diff --git a/browser/components/search/extensions/amazon/manifest.json b/browser/components/search/extensions/amazon/manifest.json
new file mode 100644
index 0000000000..1d6322bba3
--- /dev/null
+++ b/browser/components/search/extensions/amazon/manifest.json
@@ -0,0 +1,30 @@
+{
+  "name": "__MSG_extensionName__",
+  "description": "__MSG_extensionDescription__",
+  "manifest_version": 2,
+  "version": "1.10",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "amazon@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "default_locale": "au",
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "keyword": "@amazon",
+      "name": "__MSG_extensionName__",
+      "search_url": "__MSG_searchUrl__",
+      "search_form": "__MSG_searchForm__",
+      "search_url_get_params": "__MSG_searchUrlGetParams__",
+      "suggest_url": "__MSG_suggestUrl__",
+      "suggest_url_get_params": "__MSG_suggestUrlGetParams__"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/amazondotcn/_locales/default/messages.json b/browser/components/search/extensions/amazondotcn/_locales/default/messages.json
new file mode 100644
index 0000000000..9402028a43
--- /dev/null
+++ b/browser/components/search/extensions/amazondotcn/_locales/default/messages.json
@@ -0,0 +1,8 @@
+{
+  "searchUrl": {
+    "message": "https://www.amazon.cn/mn/searchApp"
+  },
+  "searchUrlGetParams": {
+    "message": "ix=sunray&pageletid=headsearch&searchType=&Go.x=0&Go.y=0&bestSaleNum=0&keywords={searchTerms}"
+  }
+}
diff --git a/browser/components/search/extensions/amazondotcn/_locales/mozillaonline/messages.json b/browser/components/search/extensions/amazondotcn/_locales/mozillaonline/messages.json
new file mode 100644
index 0000000000..888cc1d5a7
--- /dev/null
+++ b/browser/components/search/extensions/amazondotcn/_locales/mozillaonline/messages.json
@@ -0,0 +1,8 @@
+{
+  "searchUrl": {
+    "message": "https://www.amazon.cn/gp/search"
+  },
+  "searchUrlGetParams": {
+    "message": "ie=UTF8&camp=536&creative=3200&index=aps&linkCode=ur2&tag=mozilla&keywords={searchTerms}"
+  }
+}
diff --git a/browser/components/search/extensions/amazondotcn/favicon.ico b/browser/components/search/extensions/amazondotcn/favicon.ico
new file mode 100644
index 0000000000..1c39eaf8fe
--- /dev/null
+++ b/browser/components/search/extensions/amazondotcn/favicon.ico
diff --git a/browser/components/search/extensions/amazondotcn/manifest.json b/browser/components/search/extensions/amazondotcn/manifest.json
new file mode 100644
index 0000000000..e418a7d31d
--- /dev/null
+++ b/browser/components/search/extensions/amazondotcn/manifest.json
@@ -0,0 +1,28 @@
+{
+  "name": "亚马逊",
+  "description": "亚马逊搜索",
+  "manifest_version": 2,
+  "version": "1.2",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "amazondotcn@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "default_locale": "default",
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "keyword": "@amazon",
+      "name": "亚马逊",
+      "search_url": "__MSG_searchUrl__",
+      "search_form": "https://www.amazon.cn/",
+      "search_url_get_params": "__MSG_searchUrlGetParams__"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/amazondotcom/_locales/en-adm/messages.json b/browser/components/search/extensions/amazondotcom/_locales/en-adm/messages.json
new file mode 100644
index 0000000000..080a287d9c
--- /dev/null
+++ b/browser/components/search/extensions/amazondotcom/_locales/en-adm/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Amazon.com"
+  },
+  "extensionDescription": {
+    "message": "Amazon.com Search"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.com/s"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.com/exec/obidos/external-search/?field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozilla-20&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://completion.amazon.com/search/complete?q={searchTerms}&search-alias=aps&mkt=1"
+  },
+  "searchUrlGetParams": {
+    "message": "tag=admarketus-20&ref=pd_sl_a4AAADD4BD57AA13{moz:date}&k={searchTerms}"
+  }
+}
diff --git a/browser/components/search/extensions/amazondotcom/_locales/en/messages.json b/browser/components/search/extensions/amazondotcom/_locales/en/messages.json
new file mode 100644
index 0000000000..68dc9ffbec
--- /dev/null
+++ b/browser/components/search/extensions/amazondotcom/_locales/en/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Amazon.com"
+  },
+  "extensionDescription": {
+    "message": "Amazon.com Search"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.com/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.com/exec/obidos/external-search/?field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozilla-20&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://completion.amazon.com/search/complete?q={searchTerms}&search-alias=aps&mkt=1"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozilla-20&sourceid=Mozilla-search"
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/amazondotcom/_locales/us/messages.json b/browser/components/search/extensions/amazondotcom/_locales/us/messages.json
new file mode 100644
index 0000000000..e000661a5b
--- /dev/null
+++ b/browser/components/search/extensions/amazondotcom/_locales/us/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Amazon.com"
+  },
+  "extensionDescription": {
+    "message": "Amazon.com Search"
+  },
+  "searchUrl": {
+    "message": "https://www.amazon.com/exec/obidos/external-search/"
+  },
+  "searchForm": {
+    "message": "https://www.amazon.com/exec/obidos/external-search/?field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozilla-20&sourceid=Mozilla-search"
+  },
+  "suggestUrl": {
+    "message": "https://completion.amazon.com/search/complete?q={searchTerms}&search-alias=aps&mkt=1"
+  },
+  "searchUrlGetParams": {
+    "message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=moz-us-20&sourceid=Mozilla-search"
+  }
+}
diff --git a/browser/components/search/extensions/amazondotcom/favicon.ico b/browser/components/search/extensions/amazondotcom/favicon.ico
new file mode 100644
index 0000000000..1c39eaf8fe
--- /dev/null
+++ b/browser/components/search/extensions/amazondotcom/favicon.ico
diff --git a/browser/components/search/extensions/amazondotcom/manifest.json b/browser/components/search/extensions/amazondotcom/manifest.json
new file mode 100644
index 0000000000..24214433bc
--- /dev/null
+++ b/browser/components/search/extensions/amazondotcom/manifest.json
@@ -0,0 +1,29 @@
+{
+  "name": "__MSG_extensionName__",
+  "description": "__MSG_extensionDescription__",
+  "manifest_version": 2,
+  "version": "1.4",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "amazondotcom@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "default_locale": "en",
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "keyword": "@amazon",
+      "name": "__MSG_extensionName__",
+      "search_url": "__MSG_searchUrl__",
+      "search_form": "__MSG_searchForm__",
+      "suggest_url": "__MSG_suggestUrl__",
+      "search_url_get_params": "__MSG_searchUrlGetParams__"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/azerdict/favicon.ico b/browser/components/search/extensions/azerdict/favicon.ico
new file mode 100644
index 0000000000..ba687ca8e7
--- /dev/null
+++ b/browser/components/search/extensions/azerdict/favicon.ico
diff --git a/browser/components/search/extensions/azerdict/manifest.json b/browser/components/search/extensions/azerdict/manifest.json
new file mode 100644
index 0000000000..8769f76d08
--- /dev/null
+++ b/browser/components/search/extensions/azerdict/manifest.json
@@ -0,0 +1,28 @@
+{
+  "name": "Azerdict",
+  "description": "Azərbaycanın Online Lüğəti",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "azerdict@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Azerdict",
+      "search_url": "https://azerdict.com/english/",
+      "search_form": "https://azerdict.com/",
+      "search_url_get_params": "word={searchTerms}",
+      "suggest_url": "https://api.azerdict.com/english/autocomplete",
+      "suggest_url_get_params": "action=opensearch&query={searchTerms}"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/baidu/favicon.ico b/browser/components/search/extensions/baidu/favicon.ico
new file mode 100644
index 0000000000..e1c770cc4b
--- /dev/null
+++ b/browser/components/search/extensions/baidu/favicon.ico
diff --git a/browser/components/search/extensions/baidu/manifest.json b/browser/components/search/extensions/baidu/manifest.json
new file mode 100644
index 0000000000..5a91bc0fd5
--- /dev/null
+++ b/browser/components/search/extensions/baidu/manifest.json
@@ -0,0 +1,29 @@
+{
+  "name": "百度",
+  "description": "百度网页搜索",
+  "manifest_version": 2,
+  "version": "1.3",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "baidu@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "keyword": ["@\u767E\u5EA6", "@baidu"],
+      "name": "百度",
+      "search_url": "https://www.baidu.com/baidu",
+      "search_form": "https://www.baidu.com/",
+      "search_url_get_params": "tn=monline_7_dg&ie=utf-8&wd={searchTerms}",
+      "suggest_url": "https://www.baidu.com/su",
+      "suggest_url_get_params": "tn=monline_7_dg&ie=utf-8&action=opensearch&wd={searchTerms}"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/bing/favicon.ico b/browser/components/search/extensions/bing/favicon.ico
new file mode 100644
index 0000000000..fdc021cfeb
--- /dev/null
+++ b/browser/components/search/extensions/bing/favicon.ico
diff --git a/browser/components/search/extensions/bing/manifest.json b/browser/components/search/extensions/bing/manifest.json
new file mode 100644
index 0000000000..fb2c6e90b4
--- /dev/null
+++ b/browser/components/search/extensions/bing/manifest.json
@@ -0,0 +1,61 @@
+{
+  "name": "Bing",
+  "description": "Microsoft Bing",
+  "manifest_version": 2,
+  "version": "1.4",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "bing@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "keyword": "@bing",
+      "name": "Bing",
+      "search_url": "https://www.bing.com/search",
+      "search_form": "https://www.bing.com/search?pc=MOZI&q={searchTerms}",
+      "search_url_get_params": "pc=MOZI&q={searchTerms}",
+      "params": [
+        {
+          "name": "form",
+          "condition": "purpose",
+          "purpose": "contextmenu",
+          "value": "MOZCON"
+        },
+        {
+          "name": "form",
+          "condition": "purpose",
+          "purpose": "searchbar",
+          "value": "MOZSBR"
+        },
+        {
+          "name": "form",
+          "condition": "purpose",
+          "purpose": "homepage",
+          "value": "MOZSPG"
+        },
+        {
+          "name": "form",
+          "condition": "purpose",
+          "purpose": "keyword",
+          "value": "MOZLBR"
+        },
+        {
+          "name": "form",
+          "condition": "purpose",
+          "purpose": "newtab",
+          "value": "MOZTSB"
+        }
+      ],
+      "suggest_url": "https://www.bing.com/osjson.aspx",
+      "suggest_url_get_params": "query={searchTerms}&form=OSDJAS&language={moz:locale}"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/bok-NO/favicon.png b/browser/components/search/extensions/bok-NO/favicon.png
new file mode 100644
index 0000000000..c2d46117ef
--- /dev/null
+++ b/browser/components/search/extensions/bok-NO/favicon.png
diff --git a/browser/components/search/extensions/bok-NO/manifest.json b/browser/components/search/extensions/bok-NO/manifest.json
new file mode 100644
index 0000000000..368b7ae4d4
--- /dev/null
+++ b/browser/components/search/extensions/bok-NO/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Ordbok",
+  "description": "Norske ordbøker",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "bok-NO@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": [
+    "favicon.png"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Ordbok",
+      "search_url": "https://ordbok.uib.no/perl/ordbok.cgi",
+      "search_form": "https://ordbok.uib.no/",
+      "search_url_get_params": "OPP={searchTerms}&sourceid=Mozilla-search"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/ceneji/favicon.png b/browser/components/search/extensions/ceneji/favicon.png
new file mode 100644
index 0000000000..3c77b64d3c
--- /dev/null
+++ b/browser/components/search/extensions/ceneji/favicon.png
diff --git a/browser/components/search/extensions/ceneji/manifest.json b/browser/components/search/extensions/ceneji/manifest.json
new file mode 100644
index 0000000000..bbe14b0b2d
--- /dev/null
+++ b/browser/components/search/extensions/ceneji/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Ceneje.si",
+  "description": "Iskalnik Ceneje.si",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "ceneji@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": [
+    "favicon.png"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Ceneje.si",
+      "search_url": "https://www.ceneje.si/search_new.aspx",
+      "search_form": "https://www.ceneje.si",
+      "search_url_get_params": "q={searchTerms}&FF-SearchBox=1"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/coccoc/favicon.ico b/browser/components/search/extensions/coccoc/favicon.ico
new file mode 100644
index 0000000000..f128244fed
--- /dev/null
+++ b/browser/components/search/extensions/coccoc/favicon.ico
diff --git a/browser/components/search/extensions/coccoc/manifest.json b/browser/components/search/extensions/coccoc/manifest.json
new file mode 100644
index 0000000000..4888061e55
--- /dev/null
+++ b/browser/components/search/extensions/coccoc/manifest.json
@@ -0,0 +1,27 @@
+{
+  "name": "Cốc Cốc",
+  "description": "Use Cốc Cốc to search on coccoc.com",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "coccoc@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Cốc Cốc",
+      "search_url": "https://coccoc.com/search",
+      "search_url_get_params": "query={searchTerms}&s=ff&utm_source=firefox",
+      "suggest_url": "https://coccoc.com/composer/autocomplete",
+      "suggest_url_get_params": "of=b&q={searchTerms}&s=ff"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/daum-kr/favicon.ico b/browser/components/search/extensions/daum-kr/favicon.ico
new file mode 100644
index 0000000000..ed803f50e2
--- /dev/null
+++ b/browser/components/search/extensions/daum-kr/favicon.ico
diff --git a/browser/components/search/extensions/daum-kr/manifest.json b/browser/components/search/extensions/daum-kr/manifest.json
new file mode 100644
index 0000000000..b127c351c2
--- /dev/null
+++ b/browser/components/search/extensions/daum-kr/manifest.json
@@ -0,0 +1,28 @@
+{
+  "name": "다음",
+  "description": "다음 검색",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "daum-kr@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "다음",
+      "search_url": "https://search.daum.net/search",
+      "search_form": "https://search.daum.net",
+      "search_url_get_params": "q={searchTerms}&w=tot&nil_ch=ffsr",
+      "suggest_url": "https://sug.search.daum.net/search_nsuggest",
+      "suggest_url_get_params": "mod=fxjson&code=utf_in_out&q={searchTerms}"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/ddg/favicon.ico b/browser/components/search/extensions/ddg/favicon.ico
new file mode 100644
index 0000000000..560000b03e
--- /dev/null
+++ b/browser/components/search/extensions/ddg/favicon.ico
diff --git a/browser/components/search/extensions/ddg/manifest.json b/browser/components/search/extensions/ddg/manifest.json
new file mode 100644
index 0000000000..56295197aa
--- /dev/null
+++ b/browser/components/search/extensions/ddg/manifest.json
@@ -0,0 +1,29 @@
+{
+  "name": "DuckDuckGo",
+  "description": "Search DuckDuckGo",
+  "manifest_version": 2,
+  "version": "1.3",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "ddg@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "keyword": ["@duckduckgo", "@ddg"],
+      "name": "DuckDuckGo",
+      "search_url": "https://duckduckgo.com/",
+      "search_form": "https://duckduckgo.com/?q={searchTerms}",
+      "search_url_get_params": "t=ffab&q={searchTerms}",
+      "suggest_url": "https://ac.duckduckgo.com/ac/",
+      "suggest_url_get_params": "q={searchTerms}&type=list"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/ebay/_locales/at/messages.json b/browser/components/search/extensions/ebay/_locales/at/messages.json
new file mode 100644
index 0000000000..ee7ab962cc
--- /dev/null
+++ b/browser/components/search/extensions/ebay/_locales/at/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "eBay"
+  },
+  "extensionDescription": {
+    "message": "eBay - Online auctions"
+  },
+  "searchUrl": {
+    "message": "https://www.ebay.at/sch/"
+  },
+  "searchForm": {
+    "message": "https://www.ebay.at/"
+  },
+  "searchUrlGetParams": {
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=5221-53469-19255-0&kw={searchTerms}"
+  },
+  "suggestUrlGetParams": {
+    "message": "sId=16&fmt=osr&kwd={searchTerms}"
+  }
+}
diff --git a/browser/components/search/extensions/ebay/_locales/au/messages.json b/browser/components/search/extensions/ebay/_locales/au/messages.json
new file mode 100644
index 0000000000..4e0a1d374e
--- /dev/null
+++ b/browser/components/search/extensions/ebay/_locales/au/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "eBay"
+  },
+  "extensionDescription": {
+    "message": "eBay - Online auctions"
+  },
+  "searchUrl": {
+    "message": "https://www.ebay.com.au/sch/"
+  },
+  "searchForm": {
+    "message": "https://www.ebay.com.au/"
+  },
+  "searchUrlGetParams": {
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=705-53470-19255-0&kw={searchTerms}"
+  },
+  "suggestUrlGetParams": {
+    "message": "sId=15&fmt=osr&kwd={searchTerms}"
+  }
+}
diff --git a/browser/components/search/extensions/ebay/_locales/be/messages.json b/browser/components/search/extensions/ebay/_locales/be/messages.json
new file mode 100644
index 0000000000..918c0443a9
--- /dev/null
+++ b/browser/components/search/extensions/ebay/_locales/be/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "eBay"
+  },
+  "extensionDescription": {
+    "message": "eBay - Online auctions"
+  },
+  "searchUrl": {
+    "message": "https://www.befr.ebay.be/sch/"
+  },
+  "searchForm": {
+    "message": "https://www.befr.ebay.be/"
+  },
+  "searchUrlGetParams": {
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=1553-53471-19255-0&kw={searchTerms}"
+  },
+  "suggestUrlGetParams": {
+    "message": "sId=23&fmt=osr&kwd={searchTerms}"
+  }
+}
diff --git a/browser/components/search/extensions/ebay/_locales/ca/messages.json b/browser/components/search/extensions/ebay/_locales/ca/messages.json
new file mode 100644
index 0000000000..23b07f14b6
--- /dev/null
+++ b/browser/components/search/extensions/ebay/_locales/ca/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "eBay"
+  },
+  "extensionDescription": {
+    "message": "eBay - Online auctions"
+  },
+  "searchUrl": {
+    "message": "https://www.ebay.ca/sch/"
+  },
+  "searchForm": {
+    "message": "https://www.ebay.ca/"
+  },
+  "searchUrlGetParams": {
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=706-53473-19255-0&kw={searchTerms}"
+  },
+  "suggestUrlGetParams": {
+    "message": "sId=2&fmt=osr&kwd={searchTerms}"
+  }
+}
diff --git a/browser/components/search/extensions/ebay/_locales/ch/messages.json b/browser/components/search/extensions/ebay/_locales/ch/messages.json
new file mode 100644
index 0000000000..2c181eaa9f
--- /dev/null
+++ b/browser/components/search/extensions/ebay/_locales/ch/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "eBay"
+  },
+  "extensionDescription": {
+    "message": "eBay - Online auctions"
+  },
+  "searchUrl": {
+    "message": "https://www.ebay.ch/sch/"
+  },
+  "searchForm": {
+    "message": "https://www.ebay.ch/"
+  },
+  "searchUrlGetParams": {
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=5222-53480-19255-0&kw={searchTerms}"
+  },
+  "suggestUrlGetParams": {
+    "message": "sId=193&fmt=osr&kwd={searchTerms}"
+  }
+}
diff --git a/browser/components/search/extensions/ebay/_locales/de/messages.json b/browser/components/search/extensions/ebay/_locales/de/messages.json
new file mode 100644
index 0000000000..02ffb6f43a
--- /dev/null
+++ b/browser/components/search/extensions/ebay/_locales/de/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "eBay"
+  },
+  "extensionDescription": {
+    "message": "eBay - Online auctions"
+  },
+  "searchUrl": {
+    "message": "https://www.ebay.de/sch/"
+  },
+  "searchForm": {
+    "message": "https://www.ebay.de/"
+  },
+  "searchUrlGetParams": {
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=707-53477-19255-0&kw={searchTerms}"
+  },
+  "suggestUrlGetParams": {
+    "message": "sId=77&fmt=osr&kwd={searchTerms}"
+  }
+}
diff --git a/browser/components/search/extensions/ebay/_locales/en/messages.json b/browser/components/search/extensions/ebay/_locales/en/messages.json
new file mode 100644
index 0000000000..d17d77f2b3
--- /dev/null
+++ b/browser/components/search/extensions/ebay/_locales/en/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "eBay"
+  },
+  "extensionDescription": {
+    "message": "eBay - Online auctions"
+  },
+  "searchUrl": {
+    "message": "https://www.ebay.com/sch/"
+  },
+  "searchForm": {
+    "message": "https://www.ebay.com/"
+  },
+  "searchUrlGetParams": {
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=711-53200-19255-0&kw={searchTerms}"
+  },
+  "suggestUrlGetParams": {
+    "message": "sId=0&fmt=osr&kwd={searchTerms}"
+  }
+}
diff --git a/browser/components/search/extensions/ebay/_locales/es/messages.json b/browser/components/search/extensions/ebay/_locales/es/messages.json
new file mode 100644
index 0000000000..8ef67142dd
--- /dev/null
+++ b/browser/components/search/extensions/ebay/_locales/es/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "eBay"
+  },
+  "extensionDescription": {
+    "message": "eBay - Online auctions"
+  },
+  "searchUrl": {
+    "message": "https://www.ebay.es/sch/"
+  },
+  "searchForm": {
+    "message": "https://www.ebay.es/"
+  },
+  "searchUrlGetParams": {
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=1185-53479-19255-0&kw={searchTerms}"
+  },
+  "suggestUrlGetParams": {
+    "message": "sId=186&fmt=osr&kwd={searchTerms}"
+  }
+}
diff --git a/browser/components/search/extensions/ebay/_locales/fr/messages.json b/browser/components/search/extensions/ebay/_locales/fr/messages.json
new file mode 100644
index 0000000000..545afafe09
--- /dev/null
+++ b/browser/components/search/extensions/ebay/_locales/fr/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "eBay"
+  },
+  "extensionDescription": {
+    "message": "eBay - Online auctions"
+  },
+  "searchUrl": {
+    "message": "https://www.ebay.fr/sch/"
+  },
+  "searchForm": {
+    "message": "https://www.ebay.fr/"
+  },
+  "searchUrlGetParams": {
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=709-53476-19255-0&kw={searchTerms}"
+  },
+  "suggestUrlGetParams": {
+    "message": "sId=71&fmt=osr&kwd={searchTerms}"
+  }
+}
diff --git a/browser/components/search/extensions/ebay/_locales/ie/messages.json b/browser/components/search/extensions/ebay/_locales/ie/messages.json
new file mode 100644
index 0000000000..194f54adcb
--- /dev/null
+++ b/browser/components/search/extensions/ebay/_locales/ie/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "eBay"
+  },
+  "extensionDescription": {
+    "message": "eBay - Online auctions"
+  },
+  "searchUrl": {
+    "message": "https://www.ebay.ie/sch/"
+  },
+  "searchForm": {
+    "message": "https://www.ebay.ie/"
+  },
+  "searchUrlGetParams": {
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=5282-53468-19255-0&kw={searchTerms}"
+  },
+  "suggestUrlGetParams": {
+    "message": "sId=205&fmt=osr&kwd={searchTerms}"
+  }
+}
diff --git a/browser/components/search/extensions/ebay/_locales/it/messages.json b/browser/components/search/extensions/ebay/_locales/it/messages.json
new file mode 100644
index 0000000000..ff78adaa74
--- /dev/null
+++ b/browser/components/search/extensions/ebay/_locales/it/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "eBay"
+  },
+  "extensionDescription": {
+    "message": "eBay - Online auctions"
+  },
+  "searchUrl": {
+    "message": "https://www.ebay.it/sch/"
+  },
+  "searchForm": {
+    "message": "https://www.ebay.it/"
+  },
+  "searchUrlGetParams": {
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=724-53478-19255-0&kw={searchTerms}"
+  },
+  "suggestUrlGetParams": {
+    "message": "sId=101&fmt=osr&kwd={searchTerms}"
+  }
+}
diff --git a/browser/components/search/extensions/ebay/_locales/nl/messages.json b/browser/components/search/extensions/ebay/_locales/nl/messages.json
new file mode 100644
index 0000000000..075abe659a
--- /dev/null
+++ b/browser/components/search/extensions/ebay/_locales/nl/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "eBay"
+  },
+  "extensionDescription": {
+    "message": "eBay - Online auctions"
+  },
+  "searchUrl": {
+    "message": "https://www.ebay.nl/sch/"
+  },
+  "searchForm": {
+    "message": "https://www.ebay.nl/"
+  },
+  "searchUrlGetParams": {
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=1346-53482-19255-0&kw={searchTerms}"
+  },
+  "suggestUrlGetParams": {
+    "message": "sId=146&fmt=osr&kwd={searchTerms}"
+  }
+}
diff --git a/browser/components/search/extensions/ebay/_locales/uk/messages.json b/browser/components/search/extensions/ebay/_locales/uk/messages.json
new file mode 100644
index 0000000000..d0918a1e35
--- /dev/null
+++ b/browser/components/search/extensions/ebay/_locales/uk/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "eBay"
+  },
+  "extensionDescription": {
+    "message": "eBay - Online auctions"
+  },
+  "searchUrl": {
+    "message": "https://www.ebay.co.uk/sch/"
+  },
+  "searchForm": {
+    "message": "https://www.ebay.co.uk/"
+  },
+  "searchUrlGetParams": {
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=710-53481-19255-0&kw={searchTerms}"
+  },
+  "suggestUrlGetParams": {
+    "message": "sId=3&fmt=osr&kwd={searchTerms}"
+  }
+}
diff --git a/browser/components/search/extensions/ebay/favicon.ico b/browser/components/search/extensions/ebay/favicon.ico
new file mode 100644
index 0000000000..3af7a36484
--- /dev/null
+++ b/browser/components/search/extensions/ebay/favicon.ico
diff --git a/browser/components/search/extensions/ebay/manifest.json b/browser/components/search/extensions/ebay/manifest.json
new file mode 100644
index 0000000000..8a68844e60
--- /dev/null
+++ b/browser/components/search/extensions/ebay/manifest.json
@@ -0,0 +1,30 @@
+{
+  "name": "__MSG_extensionName__",
+  "description": "__MSG_extensionDescription__",
+  "manifest_version": 2,
+  "version": "1.4",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "ebay@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "default_locale": "en",
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "keyword": "@ebay",
+      "name": "__MSG_extensionName__",
+      "search_url": "__MSG_searchUrl__",
+      "search_form": "__MSG_searchForm__",
+      "search_url_get_params": "__MSG_searchUrlGetParams__",
+      "suggest_url": "https://autosug.ebay.com/autosug",
+      "suggest_url_get_params": "__MSG_suggestUrlGetParams__"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/ecosia/favicon.ico b/browser/components/search/extensions/ecosia/favicon.ico
new file mode 100644
index 0000000000..cc72d09d6d
--- /dev/null
+++ b/browser/components/search/extensions/ecosia/favicon.ico
diff --git a/browser/components/search/extensions/ecosia/manifest.json b/browser/components/search/extensions/ecosia/manifest.json
new file mode 100644
index 0000000000..f78efd125f
--- /dev/null
+++ b/browser/components/search/extensions/ecosia/manifest.json
@@ -0,0 +1,28 @@
+{
+  "name": "Ecosia",
+  "description": "Search Ecosia",
+  "manifest_version": 2,
+  "version": "1.2",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "ecosia@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Ecosia",
+      "search_url": "https://www.ecosia.org/search",
+      "search_form": "https://www.ecosia.org/",
+      "search_url_get_params": "tt=mzl&q={searchTerms}",
+      "suggest_url": "https://ac.ecosia.org/autocomplete",
+      "suggest_url_get_params": "type=list&q={searchTerms}"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/eudict/favicon.ico b/browser/components/search/extensions/eudict/favicon.ico
new file mode 100644
index 0000000000..20750d0c19
--- /dev/null
+++ b/browser/components/search/extensions/eudict/favicon.ico
diff --git a/browser/components/search/extensions/eudict/manifest.json b/browser/components/search/extensions/eudict/manifest.json
new file mode 100644
index 0000000000..d6d8288c5d
--- /dev/null
+++ b/browser/components/search/extensions/eudict/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "EUdict Eng->Cro",
+  "description": "EUdict - englesko-hrvatski rječnik",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "eudict@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "EUdict Eng->Cro",
+      "search_url": "https://eudict.com",
+      "search_form": "https://eudict.com?lang=engcro&word={searchTerms}",
+      "search_url_get_params": "lang=engcro&word={searchTerms}"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/faclair-beag/favicon.ico b/browser/components/search/extensions/faclair-beag/favicon.ico
new file mode 100644
index 0000000000..990cf93298
--- /dev/null
+++ b/browser/components/search/extensions/faclair-beag/favicon.ico
diff --git a/browser/components/search/extensions/faclair-beag/manifest.json b/browser/components/search/extensions/faclair-beag/manifest.json
new file mode 100644
index 0000000000..8ced1bddb2
--- /dev/null
+++ b/browser/components/search/extensions/faclair-beag/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "Am Faclair Beag",
+  "description": "Lorg Am Faclair Beag",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "faclair-beag@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Am Faclair Beag",
+      "search_url": "https://www.faclair.com/",
+      "search_url_get_params": "txtSearch={searchTerms}"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/gmx/_locales/de/messages.json b/browser/components/search/extensions/gmx/_locales/de/messages.json
new file mode 100644
index 0000000000..d03ed6fd64
--- /dev/null
+++ b/browser/components/search/extensions/gmx/_locales/de/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "GMX Suche"
+  },
+  "searchUrl": {
+    "message": "https://go.gmx.net/br/moz_search_web/"
+  },
+  "suggestUrl": {
+    "message": "https://suggestplugin.ui-portal.de/s"
+  },
+  "searchUrlGetParams": {
+    "message": "q={searchTerms}&enc=UTF-8"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&brand=gmx&origin=br_splugin_ff_sg"
+  }
+}
diff --git a/browser/components/search/extensions/gmx/_locales/en-GB/messages.json b/browser/components/search/extensions/gmx/_locales/en-GB/messages.json
new file mode 100644
index 0000000000..9822021f24
--- /dev/null
+++ b/browser/components/search/extensions/gmx/_locales/en-GB/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "GMX Search"
+  },
+  "searchUrl": {
+    "message": "https://go.gmx.co.uk/br/moz_search_web/"
+  },
+  "suggestUrl": {
+    "message": "https://suggestplugin.gmx.co.uk/s"
+  },
+  "searchUrlGetParams": {
+    "message": "enc=UTF-8&q={searchTerms}"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&brand=gmxcouk&origin=moz_splugin_ff&enc=UTF-8"
+  }
+}
diff --git a/browser/components/search/extensions/gmx/_locales/es/messages.json b/browser/components/search/extensions/gmx/_locales/es/messages.json
new file mode 100644
index 0000000000..664f36c0a1
--- /dev/null
+++ b/browser/components/search/extensions/gmx/_locales/es/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "GMX - Búsqueda web"
+  },
+  "searchUrl": {
+    "message": "https://go.gmx.es/br/moz_search_web/"
+  },
+  "suggestUrl": {
+    "message": "https://suggestplugin.gmx.es/s"
+  },
+  "searchUrlGetParams": {
+    "message": "enc=UTF-8&q={searchTerms}"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&brand=gmxes&origin=moz_splugin_ff&enc=UTF-8"
+  }
+}
diff --git a/browser/components/search/extensions/gmx/_locales/fr/messages.json b/browser/components/search/extensions/gmx/_locales/fr/messages.json
new file mode 100644
index 0000000000..2623548b99
--- /dev/null
+++ b/browser/components/search/extensions/gmx/_locales/fr/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "GMX - Recherche web"
+  },
+  "searchUrl": {
+    "message": "https://go.gmx.fr/br/moz_search_web/"
+  },
+  "suggestUrl": {
+    "message": "https://suggestplugin.gmx.fr/s"
+  },
+  "searchUrlGetParams": {
+    "message": "enc=UTF-8&q={searchTerms}"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&brand=gmxfr&origin=moz_splugin_ff&enc=UTF-8"
+  }
+}
diff --git a/browser/components/search/extensions/gmx/_locales/shopping/messages.json b/browser/components/search/extensions/gmx/_locales/shopping/messages.json
new file mode 100644
index 0000000000..fa15088706
--- /dev/null
+++ b/browser/components/search/extensions/gmx/_locales/shopping/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "GMX Shopping"
+  },
+  "searchUrl": {
+    "message": "https://shopping.gmx.net/"
+  },
+  "searchUrlGetParams": {
+    "message": "q={searchTerms}&origin=br_osd"
+  },
+  "suggestUrl": {
+    "message": "https://shopping.gmx.net/suggest/ca/"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}"
+  }
+}
diff --git a/browser/components/search/extensions/gmx/favicon.png b/browser/components/search/extensions/gmx/favicon.png
new file mode 100644
index 0000000000..020006b5e4
--- /dev/null
+++ b/browser/components/search/extensions/gmx/favicon.png
diff --git a/browser/components/search/extensions/gmx/manifest.json b/browser/components/search/extensions/gmx/manifest.json
new file mode 100644
index 0000000000..26b0905f0f
--- /dev/null
+++ b/browser/components/search/extensions/gmx/manifest.json
@@ -0,0 +1,28 @@
+{
+  "name": "__MSG_extensionName__",
+  "description": "__MSG_extensionName__",
+  "manifest_version": 2,
+  "version": "1.2",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "gmx@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "default_locale": "de",
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": [
+    "favicon.png"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "__MSG_extensionName__",
+      "search_url": "__MSG_searchUrl__",
+      "suggest_url": "__MSG_suggestUrl__",
+      "search_url_get_params": "__MSG_searchUrlGetParams__",
+      "suggest_url_get_params": "__MSG_suggestUrlGetParams__"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/google/_locales/en/messages.json b/browser/components/search/extensions/google/_locales/en/messages.json
new file mode 100644
index 0000000000..aeca0ef128
--- /dev/null
+++ b/browser/components/search/extensions/google/_locales/en/messages.json
@@ -0,0 +1,24 @@
+{
+  "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
new file mode 100644
index 0000000000..60e5ed5eda
--- /dev/null
+++ b/browser/components/search/extensions/google/_locales/region-by/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..8e64096bc1
--- /dev/null
+++ b/browser/components/search/extensions/google/_locales/region-kz/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..8a78bb4e7f
--- /dev/null
+++ b/browser/components/search/extensions/google/_locales/region-ru/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..8e373a4833
--- /dev/null
+++ b/browser/components/search/extensions/google/_locales/region-tr/messages.json
@@ -0,0 +1,20 @@
+{
+  "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/favicon.ico b/browser/components/search/extensions/google/favicon.ico
new file mode 100644
index 0000000000..82339b3b1d
--- /dev/null
+++ b/browser/components/search/extensions/google/favicon.ico
diff --git a/browser/components/search/extensions/google/manifest.json b/browser/components/search/extensions/google/manifest.json
new file mode 100644
index 0000000000..1e71873d0d
--- /dev/null
+++ b/browser/components/search/extensions/google/manifest.json
@@ -0,0 +1,36 @@
+{
+  "name": "__MSG_extensionName__",
+  "description": "__MSG_extensionDescription__",
+  "manifest_version": 2,
+  "version": "1.3",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "google@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "default_locale": "en",
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "keyword": "@google",
+      "name": "__MSG_extensionName__",
+      "search_url": "__MSG_searchUrl__",
+      "search_form": "__MSG_searchForm__",
+      "suggest_url": "__MSG_suggestUrl__",
+      "params": [
+        {
+          "name": "channel",
+          "condition": "pref",
+          "pref": "__MSG_channelPref__"
+        }
+      ],
+      "search_url_get_params": "__MSG_searchUrlGetParams__"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/gulesider-NO/favicon.ico b/browser/components/search/extensions/gulesider-NO/favicon.ico
new file mode 100644
index 0000000000..e35572a557
--- /dev/null
+++ b/browser/components/search/extensions/gulesider-NO/favicon.ico
diff --git a/browser/components/search/extensions/gulesider-NO/manifest.json b/browser/components/search/extensions/gulesider-NO/manifest.json
new file mode 100644
index 0000000000..6f1d098ef1
--- /dev/null
+++ b/browser/components/search/extensions/gulesider-NO/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Gule sider",
+  "description": "Gule sider person og firmasøk",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "gulesider-NO@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Gule sider",
+      "search_url": "https://www.gulesider.no/query",
+      "search_form": "https://www.gulesider.no/",
+      "search_url_get_params": "what=all&search_word={searchTerms}&cmpid=fre_partner_fire_gssbtop"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/leo_ende_de/favicon.png b/browser/components/search/extensions/leo_ende_de/favicon.png
new file mode 100644
index 0000000000..04e5e344ef
--- /dev/null
+++ b/browser/components/search/extensions/leo_ende_de/favicon.png
diff --git a/browser/components/search/extensions/leo_ende_de/manifest.json b/browser/components/search/extensions/leo_ende_de/manifest.json
new file mode 100644
index 0000000000..a7a30bb01f
--- /dev/null
+++ b/browser/components/search/extensions/leo_ende_de/manifest.json
@@ -0,0 +1,27 @@
+{
+  "name": "LEO Eng-Deu",
+  "description": "Deutsch-Englisch Wörterbuch von LEO",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "leo_ende_de@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": [
+    "favicon.png"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "LEO Eng-Deu",
+      "search_url": "https://dict.leo.org/englisch-deutsch/{searchTerms}",
+      "search_form": "https://dict.leo.org",
+      "suggest_url": "https://dict.leo.org/dictQuery/m-query/conf/ende/query.conf/strlist.json",
+      "suggest_url_get_params": "q={searchTerms}&sort=PLa&shortQuery=undefined&noDescription=undefined&noQueryURLs=undefined"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/longdo/favicon.ico b/browser/components/search/extensions/longdo/favicon.ico
new file mode 100644
index 0000000000..aa42cda97f
--- /dev/null
+++ b/browser/components/search/extensions/longdo/favicon.ico
diff --git a/browser/components/search/extensions/longdo/manifest.json b/browser/components/search/extensions/longdo/manifest.json
new file mode 100644
index 0000000000..6cc5eb8fd1
--- /dev/null
+++ b/browser/components/search/extensions/longdo/manifest.json
@@ -0,0 +1,28 @@
+{
+  "name": "พจนานุกรม ลองดู",
+  "description": "พจนานุกรม ลองดู",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "longdo@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "พจนานุกรม ลองดู",
+      "search_url": "https://dict.longdo.org/",
+      "search_form": "https://dict.longdo.org/",
+      "search_url_get_params": "search={searchTerms}&src=moz",
+      "suggest_url": "https://search.longdo.com/Suggest/HeadSearch",
+      "suggest_url_get_params": "ds=head&fxjson=1&key={searchTerms}"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/mailcom/favicon.ico b/browser/components/search/extensions/mailcom/favicon.ico
new file mode 100644
index 0000000000..9f1bed60f8
--- /dev/null
+++ b/browser/components/search/extensions/mailcom/favicon.ico
diff --git a/browser/components/search/extensions/mailcom/manifest.json b/browser/components/search/extensions/mailcom/manifest.json
new file mode 100644
index 0000000000..ea4f8b0336
--- /dev/null
+++ b/browser/components/search/extensions/mailcom/manifest.json
@@ -0,0 +1,27 @@
+{
+  "name": "mail.com",
+  "description": "mail.com",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "mailcom@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "mail.com search",
+      "search_url": "https://go.mail.com/br/moz_search_web/",
+      "search_url_get_params": "q={searchTerms}&enc=UTF-8",
+      "suggest_url": "https://search.mail.com/SuggestSearch/s",
+      "suggest_url_get_params": "q={searchTerms}&brand=mailcom&origin=br_splugin_ff_sg"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/mailru/_locales/default/messages.json b/browser/components/search/extensions/mailru/_locales/default/messages.json
new file mode 100644
index 0000000000..c902c14424
--- /dev/null
+++ b/browser/components/search/extensions/mailru/_locales/default/messages.json
@@ -0,0 +1,11 @@
+{
+  "searchForm": {
+    "message": "https://go.mail.ru/?gp=900200"
+  },
+  "searchUrlGetParams": {
+    "message": "q={searchTerms}&fr=osmi&gp=900200&frc=900200"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&gp=900200"
+  }
+}
diff --git a/browser/components/search/extensions/mailru/_locales/mailru001/messages.json b/browser/components/search/extensions/mailru/_locales/mailru001/messages.json
new file mode 100644
index 0000000000..2b40a70dd0
--- /dev/null
+++ b/browser/components/search/extensions/mailru/_locales/mailru001/messages.json
@@ -0,0 +1,11 @@
+{
+  "searchForm": {
+    "message": "https://go.mail.ru/?gp=900201"
+  },
+  "searchUrlGetParams": {
+    "message": "q={searchTerms}&fr=osmi&gp=900201&frc=900201"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&gp=900201"
+  }
+}
diff --git a/browser/components/search/extensions/mailru/_locales/okru-az/messages.json b/browser/components/search/extensions/mailru/_locales/okru-az/messages.json
new file mode 100644
index 0000000000..a8b85dc600
--- /dev/null
+++ b/browser/components/search/extensions/mailru/_locales/okru-az/messages.json
@@ -0,0 +1,11 @@
+{
+  "searchForm": {
+    "message": "https://go.mail.ru/?gp=900209"
+  },
+  "searchUrlGetParams": {
+    "message": "q={searchTerms}&fr=osmi&gp=900209&frc=900209"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&gp=900209"
+  }
+}
diff --git a/browser/components/search/extensions/mailru/_locales/okru-en-US/messages.json b/browser/components/search/extensions/mailru/_locales/okru-en-US/messages.json
new file mode 100644
index 0000000000..cf737cae11
--- /dev/null
+++ b/browser/components/search/extensions/mailru/_locales/okru-en-US/messages.json
@@ -0,0 +1,11 @@
+{
+  "searchForm": {
+    "message": "https://go.mail.ru/?gp=900205"
+  },
+  "searchUrlGetParams": {
+    "message": "q={searchTerms}&fr=osmi&gp=900205&frc=900205"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&gp=900205"
+  }
+}
diff --git a/browser/components/search/extensions/mailru/_locales/okru-hy-AM/messages.json b/browser/components/search/extensions/mailru/_locales/okru-hy-AM/messages.json
new file mode 100644
index 0000000000..65e5ef1077
--- /dev/null
+++ b/browser/components/search/extensions/mailru/_locales/okru-hy-AM/messages.json
@@ -0,0 +1,11 @@
+{
+  "searchForm": {
+    "message": "https://go.mail.ru/?gp=900211"
+  },
+  "searchUrlGetParams": {
+    "message": "q={searchTerms}&fr=osmi&gp=900211&frc=900211"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&gp=900211"
+  }
+}
diff --git a/browser/components/search/extensions/mailru/_locales/okru-kk/messages.json b/browser/components/search/extensions/mailru/_locales/okru-kk/messages.json
new file mode 100644
index 0000000000..8da96ed9b2
--- /dev/null
+++ b/browser/components/search/extensions/mailru/_locales/okru-kk/messages.json
@@ -0,0 +1,11 @@
+{
+  "searchForm": {
+    "message": "https://go.mail.ru/?gp=900206"
+  },
+  "searchUrlGetParams": {
+    "message": "q={searchTerms}&fr=osmi&gp=900206&frc=900206"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&gp=900206"
+  }
+}
diff --git a/browser/components/search/extensions/mailru/_locales/okru-ro/messages.json b/browser/components/search/extensions/mailru/_locales/okru-ro/messages.json
new file mode 100644
index 0000000000..66724aba79
--- /dev/null
+++ b/browser/components/search/extensions/mailru/_locales/okru-ro/messages.json
@@ -0,0 +1,11 @@
+{
+  "searchForm": {
+    "message": "https://go.mail.ru/?gp=900207"
+  },
+  "searchUrlGetParams": {
+    "message": "q={searchTerms}&fr=osmi&gp=900207&frc=900207"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&gp=900207"
+  }
+}
diff --git a/browser/components/search/extensions/mailru/_locales/okru-ru/messages.json b/browser/components/search/extensions/mailru/_locales/okru-ru/messages.json
new file mode 100644
index 0000000000..c38275f3cc
--- /dev/null
+++ b/browser/components/search/extensions/mailru/_locales/okru-ru/messages.json
@@ -0,0 +1,11 @@
+{
+  "searchForm": {
+    "message": "https://go.mail.ru/?gp=900203"
+  },
+  "searchUrlGetParams": {
+    "message": "q={searchTerms}&fr=osmi&gp=900203&frc=900203"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&gp=900203"
+  }
+}
diff --git a/browser/components/search/extensions/mailru/_locales/okru-tr/messages.json b/browser/components/search/extensions/mailru/_locales/okru-tr/messages.json
new file mode 100644
index 0000000000..f3126ab63a
--- /dev/null
+++ b/browser/components/search/extensions/mailru/_locales/okru-tr/messages.json
@@ -0,0 +1,11 @@
+{
+  "searchForm": {
+    "message": "https://go.mail.ru/?gp=900210"
+  },
+  "searchUrlGetParams": {
+    "message": "q={searchTerms}&fr=osmi&gp=900210&frc=900210"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&gp=900210"
+  }
+}
diff --git a/browser/components/search/extensions/mailru/_locales/okru-uk/messages.json b/browser/components/search/extensions/mailru/_locales/okru-uk/messages.json
new file mode 100644
index 0000000000..14153aa013
--- /dev/null
+++ b/browser/components/search/extensions/mailru/_locales/okru-uk/messages.json
@@ -0,0 +1,11 @@
+{
+  "searchForm": {
+    "message": "https://go.mail.ru/?gp=900204"
+  },
+  "searchUrlGetParams": {
+    "message": "q={searchTerms}&fr=osmi&gp=900204&frc=900204"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&gp=900204"
+  }
+}
diff --git a/browser/components/search/extensions/mailru/_locales/okru-uz/messages.json b/browser/components/search/extensions/mailru/_locales/okru-uz/messages.json
new file mode 100644
index 0000000000..206a696842
--- /dev/null
+++ b/browser/components/search/extensions/mailru/_locales/okru-uz/messages.json
@@ -0,0 +1,11 @@
+{
+  "searchForm": {
+    "message": "https://go.mail.ru/?gp=900208"
+  },
+  "searchUrlGetParams": {
+    "message": "q={searchTerms}&fr=osmi&gp=900208&frc=900208"
+  },
+  "suggestUrlGetParams": {
+    "message": "q={searchTerms}&gp=900208"
+  }
+}
diff --git a/browser/components/search/extensions/mailru/favicon.ico b/browser/components/search/extensions/mailru/favicon.ico
new file mode 100644
index 0000000000..a2d3a48883
--- /dev/null
+++ b/browser/components/search/extensions/mailru/favicon.ico
diff --git a/browser/components/search/extensions/mailru/manifest.json b/browser/components/search/extensions/mailru/manifest.json
new file mode 100644
index 0000000000..831bc85ce5
--- /dev/null
+++ b/browser/components/search/extensions/mailru/manifest.json
@@ -0,0 +1,29 @@
+{
+  "name": "Поиск Mail.Ru",
+  "description": "Search with Поиск Mail.Ru",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "mailru@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "default_locale": "default",
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Поиск Mail.Ru",
+      "search_url": "https://go.mail.ru/search",
+      "search_form": "__MSG_searchForm__",
+      "search_url_get_params": "__MSG_searchUrlGetParams__",
+      "suggest_url": "https://suggests.go.mail.ru/ff3",
+      "suggest_url_get_params": "__MSG_suggestUrlGetParams__"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/mapy-cz/favicon.ico b/browser/components/search/extensions/mapy-cz/favicon.ico
new file mode 100644
index 0000000000..051204c35c
--- /dev/null
+++ b/browser/components/search/extensions/mapy-cz/favicon.ico
diff --git a/browser/components/search/extensions/mapy-cz/manifest.json b/browser/components/search/extensions/mapy-cz/manifest.json
new file mode 100644
index 0000000000..d4476a95d3
--- /dev/null
+++ b/browser/components/search/extensions/mapy-cz/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Mapy.cz",
+  "description": "Vyhledávání na Mapy.cz",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "mapy-cz@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Mapy.cz",
+      "search_url": "https://www.mapy.cz/",
+      "search_form": "https://www.mapy.cz/",
+      "search_url_get_params": "q={searchTerms}&sourceid=Searchmodule_3"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/mercadolibre/_locales/ar/messages.json b/browser/components/search/extensions/mercadolibre/_locales/ar/messages.json
new file mode 100644
index 0000000000..9d6ffa1d29
--- /dev/null
+++ b/browser/components/search/extensions/mercadolibre/_locales/ar/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "MercadoLibre Argentina"
+  },
+  "extensionDescription": {
+    "message": "MercadoLibre Argentina"
+  },
+  "searchUrl": {
+    "message": "https://www.mercadolibre.com.ar/jm/search"
+  },
+  "searchForm": {
+    "message": "https://www.mercadolibre.com.ar/"
+  },
+  "searchUrlGetParams": {
+    "message": "as_word={searchTerms}"
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/mercadolibre/_locales/cl/messages.json b/browser/components/search/extensions/mercadolibre/_locales/cl/messages.json
new file mode 100644
index 0000000000..fcf2d9bcc8
--- /dev/null
+++ b/browser/components/search/extensions/mercadolibre/_locales/cl/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "MercadoLibre Chile"
+  },
+  "extensionDescription": {
+    "message": "MercadoLibre Chile"
+  },
+  "searchUrl": {
+    "message": "https://www.mercadolibre.cl/jm/search"
+  },
+  "searchForm": {
+    "message": "https://www.mercadolibre.cl/"
+  },
+  "searchUrlGetParams": {
+    "message": "as_word={searchTerms}"
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/mercadolibre/_locales/mx/messages.json b/browser/components/search/extensions/mercadolibre/_locales/mx/messages.json
new file mode 100644
index 0000000000..f18296a61b
--- /dev/null
+++ b/browser/components/search/extensions/mercadolibre/_locales/mx/messages.json
@@ -0,0 +1,17 @@
+{
+  "extensionName": {
+    "message": "MercadoLibre Mexico"
+  },
+  "extensionDescription": {
+    "message": "MercadoLibre Mexico"
+  },
+  "searchUrl": {
+    "message": "https://www.mercadolibre.com.mx/jm/search"
+  },
+  "searchForm": {
+    "message": "https://www.mercadolibre.com.mx/"
+  },
+  "searchUrlGetParams": {
+    "message": "as_word={searchTerms}"
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/mercadolibre/favicon.ico b/browser/components/search/extensions/mercadolibre/favicon.ico
new file mode 100644
index 0000000000..dc9ad5b2a9
--- /dev/null
+++ b/browser/components/search/extensions/mercadolibre/favicon.ico
diff --git a/browser/components/search/extensions/mercadolibre/manifest.json b/browser/components/search/extensions/mercadolibre/manifest.json
new file mode 100644
index 0000000000..1e22bf3710
--- /dev/null
+++ b/browser/components/search/extensions/mercadolibre/manifest.json
@@ -0,0 +1,27 @@
+{
+  "name": "__MSG_extensionName__",
+  "description": "__MSG_extensionDescription__",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "mercadolibre@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "default_locale": "ar",
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "__MSG_extensionName__",
+      "search_url": "__MSG_searchUrl__",
+      "search_form": "__MSG_searchForm__",
+      "search_url_get_params": "__MSG_searchUrlGetParams__"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/mercadolivre/favicon.ico b/browser/components/search/extensions/mercadolivre/favicon.ico
new file mode 100644
index 0000000000..dc9ad5b2a9
--- /dev/null
+++ b/browser/components/search/extensions/mercadolivre/favicon.ico
diff --git a/browser/components/search/extensions/mercadolivre/manifest.json b/browser/components/search/extensions/mercadolivre/manifest.json
new file mode 100644
index 0000000000..096600d6cc
--- /dev/null
+++ b/browser/components/search/extensions/mercadolivre/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "MercadoLivre",
+  "description": "Onde comprar e vender de Tudo.",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "mercadolivre@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "MercadoLivre",
+      "search_url": "https://www.mercadolivre.com.br/jm/search",
+      "search_form": "https://www.mercadolivre.com.br/",
+      "search_url_get_params": "as_word={searchTerms}"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/naver-kr/favicon.ico b/browser/components/search/extensions/naver-kr/favicon.ico
new file mode 100644
index 0000000000..eed93a92cb
--- /dev/null
+++ b/browser/components/search/extensions/naver-kr/favicon.ico
diff --git a/browser/components/search/extensions/naver-kr/manifest.json b/browser/components/search/extensions/naver-kr/manifest.json
new file mode 100644
index 0000000000..e7311a6a3f
--- /dev/null
+++ b/browser/components/search/extensions/naver-kr/manifest.json
@@ -0,0 +1,28 @@
+{
+  "name": "네이버",
+  "description": "네이버 검색",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "naver-kr@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "네이버",
+      "search_url": "https://search.naver.com/search.naver",
+      "search_form": "https://search.naver.com",
+      "search_url_get_params": "where=nexearch&frm=ff&sm=oss&ie=utf8&query={searchTerms}",
+      "suggest_url": "https://ac.search.naver.com/nx/ac",
+      "suggest_url_get_params": "of=os&ie=utf-8&q={searchTerms}"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/odpiralni/favicon.png b/browser/components/search/extensions/odpiralni/favicon.png
new file mode 100644
index 0000000000..044d4f13d4
--- /dev/null
+++ b/browser/components/search/extensions/odpiralni/favicon.png
diff --git a/browser/components/search/extensions/odpiralni/manifest.json b/browser/components/search/extensions/odpiralni/manifest.json
new file mode 100644
index 0000000000..43d0d172e9
--- /dev/null
+++ b/browser/components/search/extensions/odpiralni/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "Odpiralni Časi",
+  "description": "Odpiralni Časi v Sloveniji",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "odpiralni@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": [
+    "favicon.png"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Odpiralni Časi",
+      "search_url": "https://www.odpiralnicasi.com/spots",
+      "search_url_get_params": "q={searchTerms}&source=1"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/pazaruvaj/favicon.ico b/browser/components/search/extensions/pazaruvaj/favicon.ico
new file mode 100644
index 0000000000..36f0cff233
--- /dev/null
+++ b/browser/components/search/extensions/pazaruvaj/favicon.ico
diff --git a/browser/components/search/extensions/pazaruvaj/manifest.json b/browser/components/search/extensions/pazaruvaj/manifest.json
new file mode 100644
index 0000000000..735ea07ca7
--- /dev/null
+++ b/browser/components/search/extensions/pazaruvaj/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Pazaruvaj",
+  "description": "Надежден помощник за покупки, сравнение на цени, онлайн магазини, описания, мнения, видеоклипове",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "pazaruvaj@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Pazaruvaj",
+      "search_url": "https://www.pazaruvaj.com/CategorySearch.php",
+      "search_form": "https://www.pazaruvaj.com/",
+      "search_url_get_params": "st={searchTerms}"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/priberam/favicon.png b/browser/components/search/extensions/priberam/favicon.png
new file mode 100644
index 0000000000..98924439d5
--- /dev/null
+++ b/browser/components/search/extensions/priberam/favicon.png
diff --git a/browser/components/search/extensions/priberam/manifest.json b/browser/components/search/extensions/priberam/manifest.json
new file mode 100644
index 0000000000..2fd4ae62a3
--- /dev/null
+++ b/browser/components/search/extensions/priberam/manifest.json
@@ -0,0 +1,27 @@
+{
+  "name": "Priberam",
+  "description": "Dicionário Priberam",
+  "manifest_version": 2,
+  "version": "1.3",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "priberam@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": [
+    "favicon.png"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Priberam",
+      "encoding": "ISO-8859-15",
+      "search_url": "https://www.priberam.pt/dlpo/firefox.aspx",
+      "search_form": "https://www.priberam.pt/dlpo/",
+      "search_url_get_params": "pal={searchTerms}"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/prisjakt-sv-SE/favicon.ico b/browser/components/search/extensions/prisjakt-sv-SE/favicon.ico
new file mode 100644
index 0000000000..feac665f71
--- /dev/null
+++ b/browser/components/search/extensions/prisjakt-sv-SE/favicon.ico
diff --git a/browser/components/search/extensions/prisjakt-sv-SE/manifest.json b/browser/components/search/extensions/prisjakt-sv-SE/manifest.json
new file mode 100644
index 0000000000..a00743df9d
--- /dev/null
+++ b/browser/components/search/extensions/prisjakt-sv-SE/manifest.json
@@ -0,0 +1,28 @@
+{
+  "name": "Prisjakt",
+  "description": "Prisjakt - jämför priser och produkter",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "prisjakt-sv-SE@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Prisjakt",
+      "search_url": "https://www.prisjakt.nu/search",
+      "search_url_get_params": "search={searchTerms}",
+      "search_form": "https://www.prisjakt.nu/search?search={searchTerms}",
+      "suggest_url": "https://www.prisjakt.nu/plugins/opensearch/suggestions.php",
+      "suggest_url_get_params": "search={searchTerms}"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/qwant/favicon.ico b/browser/components/search/extensions/qwant/favicon.ico
new file mode 100644
index 0000000000..d43d1d5aa6
--- /dev/null
+++ b/browser/components/search/extensions/qwant/favicon.ico
diff --git a/browser/components/search/extensions/qwant/manifest.json b/browser/components/search/extensions/qwant/manifest.json
new file mode 100644
index 0000000000..3fb83f307b
--- /dev/null
+++ b/browser/components/search/extensions/qwant/manifest.json
@@ -0,0 +1,28 @@
+{
+  "name": "Qwant",
+  "manifest_version": 2,
+  "version": "1.4",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "qwant@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "keyword": "@qwant",
+      "name": "Qwant",
+      "search_url": "https://www.qwant.com/",
+      "search_url_get_params": "client=brz-moz&q={searchTerms}",
+      "suggest_url": "https://api.qwant.com/api/suggest/",
+      "suggest_url_get_params": "client=opensearch&q={searchTerms}",
+      "search_form": "https://www.qwant.com/"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/qwantjr/favicon.ico b/browser/components/search/extensions/qwantjr/favicon.ico
new file mode 100644
index 0000000000..d43d1d5aa6
--- /dev/null
+++ b/browser/components/search/extensions/qwantjr/favicon.ico
diff --git a/browser/components/search/extensions/qwantjr/manifest.json b/browser/components/search/extensions/qwantjr/manifest.json
new file mode 100644
index 0000000000..3acf155af8
--- /dev/null
+++ b/browser/components/search/extensions/qwantjr/manifest.json
@@ -0,0 +1,27 @@
+{
+  "name": "Qwant Junior",
+  "manifest_version": 2,
+  "version": "1.2",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "qwantjr@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Qwant Junior",
+      "search_url": "https://www.qwantjunior.com/",
+      "search_url_get_params": "q={searchTerms}&client=firefoxqwant",
+      "suggest_url": "https://api.qwant.com/egp/suggest/",
+      "suggest_url_get_params": "q={searchTerms}&client=opensearch",
+      "search_form": "https://www.qwantjunior.com/"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/rakuten/favicon.ico b/browser/components/search/extensions/rakuten/favicon.ico
new file mode 100644
index 0000000000..66afe98469
--- /dev/null
+++ b/browser/components/search/extensions/rakuten/favicon.ico
diff --git a/browser/components/search/extensions/rakuten/manifest.json b/browser/components/search/extensions/rakuten/manifest.json
new file mode 100644
index 0000000000..2404639a1a
--- /dev/null
+++ b/browser/components/search/extensions/rakuten/manifest.json
@@ -0,0 +1,27 @@
+{
+  "name": "楽天市場",
+  "description": "楽天市場 商品検索",
+  "manifest_version": 2,
+  "version": "1.3",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "rakuten@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "楽天市場",
+      "encoding": "EUC-JP",
+      "search_url": "https://pt.afl.rakuten.co.jp/c/013ca98b.cd7c5f0c/",
+      "search_form": "https://www.rakuten.co.jp/",
+      "search_url_get_params": "sitem={searchTerms}&sv=2&p=0"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/readmoo/favicon.ico b/browser/components/search/extensions/readmoo/favicon.ico
new file mode 100644
index 0000000000..75396dc9ca
--- /dev/null
+++ b/browser/components/search/extensions/readmoo/favicon.ico
diff --git a/browser/components/search/extensions/readmoo/manifest.json b/browser/components/search/extensions/readmoo/manifest.json
new file mode 100644
index 0000000000..3a76d99d36
--- /dev/null
+++ b/browser/components/search/extensions/readmoo/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Readmoo 讀墨電子書",
+  "description": "Readmoo 讀墨電子書",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "readmoo@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Readmoo 讀墨電子書",
+      "search_url": "https://readmoo.com/search/keyword",
+      "search_form": "https://readmoo.com/search/keyword?pi=0&q={searchTerms}&st=true",
+      "search_url_get_params": "pi=0&q={searchTerms}&st=true"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/salidzinilv/favicon.ico b/browser/components/search/extensions/salidzinilv/favicon.ico
new file mode 100644
index 0000000000..0a7d01cae8
--- /dev/null
+++ b/browser/components/search/extensions/salidzinilv/favicon.ico
diff --git a/browser/components/search/extensions/salidzinilv/manifest.json b/browser/components/search/extensions/salidzinilv/manifest.json
new file mode 100644
index 0000000000..eb88e7f06e
--- /dev/null
+++ b/browser/components/search/extensions/salidzinilv/manifest.json
@@ -0,0 +1,28 @@
+{
+  "name": "Salidzini.lv",
+  "description": "Salidzini.lv - Latvijas interneta veikalu mekletajs",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "salidzinilv@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Salidzini.lv",
+      "search_url": "https://www.salidzini.lv/search.php",
+      "search_form": "https://salidzini.lv",
+      "search_url_get_params": "q={searchTerms}&utm_source=firefox-plugin",
+      "suggest_url": "https://www.salidzini.lv/suggested_search.php",
+      "suggest_url_get_params": "q={searchTerms}&utm_source=firefox-plugin"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/seznam-cz/favicon.ico b/browser/components/search/extensions/seznam-cz/favicon.ico
new file mode 100644
index 0000000000..f3e078a107
--- /dev/null
+++ b/browser/components/search/extensions/seznam-cz/favicon.ico
diff --git a/browser/components/search/extensions/seznam-cz/manifest.json b/browser/components/search/extensions/seznam-cz/manifest.json
new file mode 100644
index 0000000000..3cbb86f149
--- /dev/null
+++ b/browser/components/search/extensions/seznam-cz/manifest.json
@@ -0,0 +1,28 @@
+{
+  "name": "Seznam",
+  "description": "Vyhledávání na Seznam.cz",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "seznam-cz@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Seznam",
+      "search_url": "https://search.seznam.cz/",
+      "search_form": "https://search.seznam.cz/?q={searchTerms}&sourceid=firefox",
+      "search_url_get_params": "q={searchTerms}&sourceid=firefox",
+      "suggest_url": "https://suggest.seznam.cz/fulltext_ff",
+      "suggest_url_get_params": "phrase={searchTerms}"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/tyda-sv-SE/favicon.ico b/browser/components/search/extensions/tyda-sv-SE/favicon.ico
new file mode 100644
index 0000000000..7415cbb160
--- /dev/null
+++ b/browser/components/search/extensions/tyda-sv-SE/favicon.ico
diff --git a/browser/components/search/extensions/tyda-sv-SE/manifest.json b/browser/components/search/extensions/tyda-sv-SE/manifest.json
new file mode 100644
index 0000000000..bcbb544fcb
--- /dev/null
+++ b/browser/components/search/extensions/tyda-sv-SE/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Tyda.se",
+  "description": "Tyda.se, lexikon, ordlista och översättning.",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "tyda-sv-SE@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Tyda.se",
+      "search_url": "https://tyda.se",
+      "search_form": "https://tyda.se",
+      "search_url_get_params": "w={searchTerms}"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/vatera/favicon.ico b/browser/components/search/extensions/vatera/favicon.ico
new file mode 100644
index 0000000000..5b02f16cb9
--- /dev/null
+++ b/browser/components/search/extensions/vatera/favicon.ico
diff --git a/browser/components/search/extensions/vatera/manifest.json b/browser/components/search/extensions/vatera/manifest.json
new file mode 100644
index 0000000000..085f35b801
--- /dev/null
+++ b/browser/components/search/extensions/vatera/manifest.json
@@ -0,0 +1,27 @@
+{
+  "name": "Vatera.hu",
+  "description": "Keresés a Vatera.hu piacterén",
+  "manifest_version": 2,
+  "version": "1.3",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "vatera@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Vatera.hu",
+      "encoding": "ISO-8859-2",
+      "search_url": "https://www.vatera.hu/listings/index.php",
+      "search_form": "https://www.vatera.hu/",
+      "search_url_get_params": "q={searchTerms}&c=0&td=on"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/webde/favicon.ico b/browser/components/search/extensions/webde/favicon.ico
new file mode 100644
index 0000000000..f0ef93d209
--- /dev/null
+++ b/browser/components/search/extensions/webde/favicon.ico
diff --git a/browser/components/search/extensions/webde/manifest.json b/browser/components/search/extensions/webde/manifest.json
new file mode 100644
index 0000000000..141f74054b
--- /dev/null
+++ b/browser/components/search/extensions/webde/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "WEB.DE Suche",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "webde@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "WEB.DE Suche",
+      "search_url": "https://go.web.de/br/moz_search_web/",
+      "search_url_get_params": "q={searchTerms}&enc=UTF-8",
+      "suggest_url": "https://suggestplugin.ui-portal.de/s",
+      "suggest_url_get_params": "q={searchTerms}&brand=webde&origin=br_splugin_ff_sg"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/wikipedia/_locales/NN/messages.json b/browser/components/search/extensions/wikipedia/_locales/NN/messages.json
new file mode 100644
index 0000000000..e4ee66bc78
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/NN/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..ec016ac733
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/NO/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..8cf9de8ac9
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/af/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..e8cce665c9
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/an/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..de90b2a205
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/ar/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..a127ba07f2
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/ast/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..f551a717e6
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/az/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..aecfecf2fb
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/be-tarask/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..6aa763451e
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/be/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..896a85d66b
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/bg/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..fe9887ed19
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/bn/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..33869ce8e7
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/br/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..746150e3d8
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/bs/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..151ec1a71b
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/ca/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..cfed7c73be
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/cy/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..12f7eb22d7
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/cz/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..801d5a5183
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/da/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..0e6bbe8905
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/de/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..ffca44b5f7
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/dsb/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..95b48f3d9c
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/el/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..0de3c9a807
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/en/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..10aa88dd11
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/eo/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..09ec1f7576
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/es/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..91363fbb39
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/et/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..1bd7027dec
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/eu/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..9fdc964a1e
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/fa/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..17a9cbe22c
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/fi/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..33dcbe9dc5
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/fr/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..f350162fbb
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/fy-NL/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..994ea723c6
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/ga-IE/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..f16f16fb4a
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/gd/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..88880bffc3
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/gl/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..5efc5ed74a
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/gn/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..3d2f68826f
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/gu/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..1f8471e980
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/he/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..f3b7d14eaf
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/hi/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..18a6177efc
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/hr/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..d4e62836e6
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/hsb/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..68300c48a6
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/hu/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..56c2ae2c64
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/hy/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..6d997ae8fc
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/ia/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..1d35e71b95
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/id/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..f722d88187
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/is/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..2ca645740f
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/it/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..7215e68768
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/ja/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..c460a093e5
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/ka/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..3cf743b616
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/kab/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..0844cca0d7
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/kk/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..0f0a0880e1
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/km/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..379ef20085
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/kn/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..54296cac62
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/kr/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..cb90db5e40
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/lij/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..712746ec63
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/lo/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..c061bcc522
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/lt/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..0e02810ef3
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/ltg/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..f73814b857
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/lv/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..de7e06e1ac
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/mk/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..bd46dd8370
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/mr/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..c817e82c78
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/ms/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..62342d1b90
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/my/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..eb22344341
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/ne/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..c2a810c2ae
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/nl/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..3cadc3d68f
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/oc/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..dff38c2146
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/pa/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..315aa0d9cb
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/pl/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..4beaa97acc
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/pt/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..8258d5e434
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/rm/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..48865fd547
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/ro/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..569467691d
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/ru/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..0406ae728d
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/si/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..5c2f75f8b0
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/sk/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..7385a22034
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/sl/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..68361d8ab2
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/sq/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..50ebc0a197
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/sr/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..1edc3db80d
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/sv-SE/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..54397603b0
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/ta/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..c474be12a7
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/te/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..3d6aeb07ca
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/th/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..d55b03131f
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/tl/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..878b28ab68
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/tr/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..2749b86304
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/uk/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..dcc87e0c85
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/ur/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..89a8f2a89b
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/uz/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..c0844e4feb
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/vi/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..7efde3b1d0
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/wo/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..29047565a2
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/zh-CN/messages.json
@@ -0,0 +1,20 @@
+{
+  "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
new file mode 100644
index 0000000000..a0e8d880ea
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/_locales/zh-TW/messages.json
@@ -0,0 +1,20 @@
+{
+  "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/favicon.ico b/browser/components/search/extensions/wikipedia/favicon.ico
new file mode 100644
index 0000000000..4314071e24
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/favicon.ico
diff --git a/browser/components/search/extensions/wikipedia/manifest.json b/browser/components/search/extensions/wikipedia/manifest.json
new file mode 100644
index 0000000000..ab3857f807
--- /dev/null
+++ b/browser/components/search/extensions/wikipedia/manifest.json
@@ -0,0 +1,29 @@
+{
+  "name": "__MSG_extensionName__",
+  "description": "__MSG_extensionDescription__",
+  "manifest_version": 2,
+  "version": "1.2",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "wikipedia@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "default_locale": "en",
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "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__"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/wiktionary/_locales/oc/messages.json b/browser/components/search/extensions/wiktionary/_locales/oc/messages.json
new file mode 100644
index 0000000000..e45d4dccee
--- /dev/null
+++ b/browser/components/search/extensions/wiktionary/_locales/oc/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "Wikiccionari (oc)"
+  },
+  "extensionDescription": {
+    "message": "Wikiccionari, lo diccionari liure"
+  },
+  "searchUrl": {
+    "message": "https://oc.wiktionary.org/wiki/Especial:Recèrca"
+  },
+  "searchForm": {
+    "message": "https://oc.wiktionary.org/wiki/Especial:Recèrca?search={searchTerms}"
+  },
+  "suggestUrl": {
+    "message": "https://oc.wiktionary.org/w/api.php?action=opensearch&search={searchTerms}&namespace=0"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}"
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/wiktionary/_locales/te/messages.json b/browser/components/search/extensions/wiktionary/_locales/te/messages.json
new file mode 100644
index 0000000000..7dc3258203
--- /dev/null
+++ b/browser/components/search/extensions/wiktionary/_locales/te/messages.json
@@ -0,0 +1,20 @@
+{
+  "extensionName": {
+    "message": "విక్షనరీ (te)"
+  },
+  "extensionDescription": {
+    "message": "విక్షనరీ (te)"
+  },
+  "searchUrl": {
+    "message": "https://te.wiktionary.org/wiki/ప్రత్యేక:అన్వేషణ"
+  },
+  "searchForm": {
+    "message": "https://te.wiktionary.org/wiki/ప్రత్యేక:అన్వేషణ?search={searchTerms}"
+  },
+  "suggestUrl": {
+    "message": "https://te.wiktionary.org/w/api.php?action=opensearch&search={searchTerms}&namespace=0"
+  },
+  "searchUrlGetParams": {
+    "message": "search={searchTerms}"
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/wiktionary/favicon.ico b/browser/components/search/extensions/wiktionary/favicon.ico
new file mode 100644
index 0000000000..31b0e38092
--- /dev/null
+++ b/browser/components/search/extensions/wiktionary/favicon.ico
diff --git a/browser/components/search/extensions/wiktionary/manifest.json b/browser/components/search/extensions/wiktionary/manifest.json
new file mode 100644
index 0000000000..d5f5cb756c
--- /dev/null
+++ b/browser/components/search/extensions/wiktionary/manifest.json
@@ -0,0 +1,28 @@
+{
+  "name": "__MSG_extensionName__",
+  "description": "__MSG_extensionDescription__",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "wiktionary@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "default_locale": "oc",
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "__MSG_extensionName__",
+      "search_url": "__MSG_searchUrl__",
+      "search_form": "__MSG_searchForm__",
+      "suggest_url": "__MSG_suggestUrl__",
+      "search_url_get_params": "__MSG_searchUrlGetParams__"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/wolnelektury-pl/favicon.png b/browser/components/search/extensions/wolnelektury-pl/favicon.png
new file mode 100644
index 0000000000..77f6db5322
--- /dev/null
+++ b/browser/components/search/extensions/wolnelektury-pl/favicon.png
diff --git a/browser/components/search/extensions/wolnelektury-pl/manifest.json b/browser/components/search/extensions/wolnelektury-pl/manifest.json
new file mode 100644
index 0000000000..90b626649e
--- /dev/null
+++ b/browser/components/search/extensions/wolnelektury-pl/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Wolne Lektury",
+  "description": "Biblioteka internetowa WolneLektury.pl",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "wolnelektury-pl@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": [
+    "favicon.png"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Wolne Lektury",
+      "search_url": "https://wolnelektury.pl/szukaj/?q={searchTerms}",
+      "search_form": "https://wolnelektury.pl",
+      "suggest_url": "https://wolnelektury.pl/katalog/jtags/?mozhint=1&q={searchTerms}"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/yahoo-jp-auctions/favicon.ico b/browser/components/search/extensions/yahoo-jp-auctions/favicon.ico
new file mode 100644
index 0000000000..4401c7a40e
--- /dev/null
+++ b/browser/components/search/extensions/yahoo-jp-auctions/favicon.ico
diff --git a/browser/components/search/extensions/yahoo-jp-auctions/manifest.json b/browser/components/search/extensions/yahoo-jp-auctions/manifest.json
new file mode 100644
index 0000000000..3b21ee940d
--- /dev/null
+++ b/browser/components/search/extensions/yahoo-jp-auctions/manifest.json
@@ -0,0 +1,27 @@
+{
+  "name": "ヤフオク!",
+  "description": "ヤフオク! 検索",
+  "manifest_version": 2,
+  "version": "1.4",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "yahoo-jp-auctions@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "ヤフオク!",
+      "encoding": "EUC-JP",
+      "search_url": "https://auctions.yahoo.co.jp/search/search",
+      "search_form": "https://auctions.yahoo.co.jp/",
+      "search_url_get_params": "p={searchTerms}&ei=EUC-JP&fr=mozff"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/yahoo-jp/favicon.ico b/browser/components/search/extensions/yahoo-jp/favicon.ico
new file mode 100644
index 0000000000..34a916ccde
--- /dev/null
+++ b/browser/components/search/extensions/yahoo-jp/favicon.ico
diff --git a/browser/components/search/extensions/yahoo-jp/manifest.json b/browser/components/search/extensions/yahoo-jp/manifest.json
new file mode 100644
index 0000000000..77697e0dea
--- /dev/null
+++ b/browser/components/search/extensions/yahoo-jp/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Yahoo! JAPAN",
+  "description": "Yahoo Search",
+  "manifest_version": 2,
+  "version": "1.1",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "yahoo-jp@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Yahoo! JAPAN",
+      "search_url": "https://search.yahoo.co.jp/search",
+      "search_form": "https://search.yahoo.co.jp/",
+      "search_url_get_params": "p={searchTerms}&ei=UTF-8&fr=mozff"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/browser/components/search/extensions/yandex/_locales/az/messages.json b/browser/components/search/extensions/yandex/_locales/az/messages.json
new file mode 100644
index 0000000000..d57aca3bb5
--- /dev/null
+++ b/browser/components/search/extensions/yandex/_locales/az/messages.json
@@ -0,0 +1,38 @@
+{
+  "extensionName": {
+    "message": "Yandex"
+  },
+  "extensionDescription": {
+    "message": "İnternetdə axtarış üçün Yandexdən istifadə edin."
+  },
+  "searchUrl": {
+    "message": "https://yandex.az/search"
+  },
+  "searchForm": {
+    "message": "https://www.yandex.az/"
+  },
+  "suggestUrl": {
+    "message": "https://yandex.az/suggest/suggest-ff.cgi?part={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "text={searchTerms}"
+  },
+  "param_searchbar": {
+    "message": "2186618"
+  },
+  "param_keyword": {
+    "message": "2186621"
+  },
+  "param_contextmenu": {
+    "message": "2186623"
+  },
+  "param_homepage": {
+    "message": "2186617"
+  },
+  "param_newtab": {
+    "message": "2186620"
+  },
+  "extensionIcon": {
+    "message": "yandex-ru.ico"
+  }
+}
diff --git a/browser/components/search/extensions/yandex/_locales/by/messages.json b/browser/components/search/extensions/yandex/_locales/by/messages.json
new file mode 100644
index 0000000000..0bcb41945e
--- /dev/null
+++ b/browser/components/search/extensions/yandex/_locales/by/messages.json
@@ -0,0 +1,38 @@
+{
+  "extensionName": {
+    "message": "Яндекс"
+  },
+  "extensionDescription": {
+    "message": "Пошук з дапамогаю Яндекс"
+  },
+  "searchUrl": {
+    "message": "https://yandex.by/search"
+  },
+  "searchForm": {
+    "message": "https://www.yandex.by/"
+  },
+  "suggestUrl": {
+    "message": "https://suggest.yandex.by/suggest-ff.cgi?part={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "text={searchTerms}"
+  },
+  "param_searchbar": {
+    "message": "2186618"
+  },
+  "param_keyword": {
+    "message": "2186621"
+  },
+  "param_contextmenu": {
+    "message": "2186623"
+  },
+  "param_homepage": {
+    "message": "2186617"
+  },
+  "param_newtab": {
+    "message": "2186620"
+  },
+  "extensionIcon": {
+    "message": "yandex-ru.ico"
+  }
+}
diff --git a/browser/components/search/extensions/yandex/_locales/en/messages.json b/browser/components/search/extensions/yandex/_locales/en/messages.json
new file mode 100644
index 0000000000..ee7f914640
--- /dev/null
+++ b/browser/components/search/extensions/yandex/_locales/en/messages.json
@@ -0,0 +1,38 @@
+{
+  "extensionName": {
+    "message": "Yandex"
+  },
+  "extensionDescription": {
+    "message": "Use Yandex to search the Internet."
+  },
+  "searchUrl": {
+    "message": "https://www.yandex.com/search"
+  },
+  "searchForm": {
+    "message": "https://www.yandex.com/"
+  },
+  "suggestUrl": {
+    "message": "https://suggest.yandex.com/suggest-ff.cgi?part={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "text={searchTerms}"
+  },
+  "param_searchbar": {
+    "message": "2186618"
+  },
+  "param_keyword": {
+    "message": "2186621"
+  },
+  "param_contextmenu": {
+    "message": "2186623"
+  },
+  "param_homepage": {
+    "message": "2186617"
+  },
+  "param_newtab": {
+    "message": "2186620"
+  },
+  "extensionIcon": {
+    "message": "yandex-en.ico"
+  }
+}
diff --git a/browser/components/search/extensions/yandex/_locales/kk/messages.json b/browser/components/search/extensions/yandex/_locales/kk/messages.json
new file mode 100644
index 0000000000..c1e924d987
--- /dev/null
+++ b/browser/components/search/extensions/yandex/_locales/kk/messages.json
@@ -0,0 +1,38 @@
+{
+  "extensionName": {
+    "message": "Яндекс"
+  },
+  "extensionDescription": {
+    "message": "Воспользуйтесь Яндексом для поиска в Интернете."
+  },
+  "searchUrl": {
+    "message": "https://yandex.kz/search"
+  },
+  "searchForm": {
+    "message": "https://www.yandex.kz/"
+  },
+  "suggestUrl": {
+    "message": "https://suggest.yandex.kz/suggest-ff.cgi?part={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "text={searchTerms}"
+  },
+  "param_searchbar": {
+    "message": "2186618"
+  },
+  "param_keyword": {
+    "message": "2186621"
+  },
+  "param_contextmenu": {
+    "message": "2186623"
+  },
+  "param_homepage": {
+    "message": "2186617"
+  },
+  "param_newtab": {
+    "message": "2186620"
+  },
+  "extensionIcon": {
+    "message": "yandex-ru.ico"
+  }
+}
diff --git a/browser/components/search/extensions/yandex/_locales/ru/messages.json b/browser/components/search/extensions/yandex/_locales/ru/messages.json
new file mode 100644
index 0000000000..072370fd00
--- /dev/null
+++ b/browser/components/search/extensions/yandex/_locales/ru/messages.json
@@ -0,0 +1,38 @@
+{
+  "extensionName": {
+    "message": "Яндекс"
+  },
+  "extensionDescription": {
+    "message": "Воспользуйтесь Яндексом для поиска в Интернете."
+  },
+  "searchUrl": {
+    "message": "https://yandex.ru/search"
+  },
+  "searchForm": {
+    "message": "https://www.yandex.ru/"
+  },
+  "suggestUrl": {
+    "message": "https://suggest.yandex.ru/suggest-ff.cgi?part={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "text={searchTerms}"
+  },
+  "param_searchbar": {
+    "message": "2186618"
+  },
+  "param_keyword": {
+    "message": "2186621"
+  },
+  "param_contextmenu": {
+    "message": "2186623"
+  },
+  "param_homepage": {
+    "message": "2186617"
+  },
+  "param_newtab": {
+    "message": "2186620"
+  },
+  "extensionIcon": {
+    "message": "yandex-ru.ico"
+  }
+}
diff --git a/browser/components/search/extensions/yandex/_locales/tr/messages.json b/browser/components/search/extensions/yandex/_locales/tr/messages.json
new file mode 100644
index 0000000000..35b4a44bae
--- /dev/null
+++ b/browser/components/search/extensions/yandex/_locales/tr/messages.json
@@ -0,0 +1,38 @@
+{
+  "extensionName": {
+    "message": "Yandex"
+  },
+  "extensionDescription": {
+    "message": "Yandex Türkiye arama motoru"
+  },
+  "searchUrl": {
+    "message": "https://yandex.com.tr/search"
+  },
+  "searchForm": {
+    "message": "https://www.yandex.com.tr/"
+  },
+  "suggestUrl": {
+    "message": "https://suggest.yandex.com.tr/suggest-ff.cgi?part={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "text={searchTerms}"
+  },
+  "param_searchbar": {
+    "message": "2186618"
+  },
+  "param_keyword": {
+    "message": "2186621"
+  },
+  "param_contextmenu": {
+    "message": "2186623"
+  },
+  "param_homepage": {
+    "message": "2186617"
+  },
+  "param_newtab": {
+    "message": "2186620"
+  },
+  "extensionIcon": {
+    "message": "yandex-en.ico"
+  }
+}
diff --git a/browser/components/search/extensions/yandex/_locales/ua/messages.json b/browser/components/search/extensions/yandex/_locales/ua/messages.json
new file mode 100644
index 0000000000..6d7efc2848
--- /dev/null
+++ b/browser/components/search/extensions/yandex/_locales/ua/messages.json
@@ -0,0 +1,23 @@
+{
+  "extensionName": {
+    "message": "Яндекс"
+  },
+  "extensionDescription": {
+    "message": "Воспользуйтесь Яндексом для поиска в Интернете."
+  },
+  "searchUrl": {
+    "message": "https://yandex.ua/yandsearch"
+  },
+  "searchForm": {
+    "message": "https://www.yandex.ua/"
+  },
+  "suggestUrl": {
+    "message": "https://suggest.yandex.ua/suggest-ff.cgi?part={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "text={searchTerms}"
+  },
+  "extensionIcon": {
+    "message": "yandex-ru.ico"
+  }
+}
diff --git a/browser/components/search/extensions/yandex/manifest.json b/browser/components/search/extensions/yandex/manifest.json
new file mode 100644
index 0000000000..e00bdc3e25
--- /dev/null
+++ b/browser/components/search/extensions/yandex/manifest.json
@@ -0,0 +1,62 @@
+{
+  "name": "__MSG_extensionName__",
+  "description": "__MSG_extensionDescription__",
+  "manifest_version": 2,
+  "version": "1.3",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "yandex@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "default_locale": "en",
+  "icons": {
+    "16": "__MSG_extensionIcon__"
+  },
+  "web_accessible_resources": [
+    "yandex-en.ico",
+    "yandex-ru.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "keyword": ["@\u044F\u043D\u0434\u0435\u043A\u0441", "@yandex"],
+      "name": "__MSG_extensionName__",
+      "search_url": "__MSG_searchUrl__",
+      "search_form": "__MSG_searchForm__",
+      "suggest_url": "__MSG_suggestUrl__",
+      "params": [
+        {
+          "name": "clid",
+          "condition": "purpose",
+          "purpose": "searchbar",
+          "value": "__MSG_param_searchbar__"
+        },
+        {
+          "name": "clid",
+          "condition": "purpose",
+          "purpose": "keyword",
+          "value": "__MSG_param_keyword__"
+        },
+        {
+          "name": "clid",
+          "condition": "purpose",
+          "purpose": "contextmenu",
+          "value": "__MSG_param_contextmenu__"
+        },
+        {
+          "name": "clid",
+          "condition": "purpose",
+          "purpose": "homepage",
+          "value": "__MSG_param_homepage__"
+        },
+        {
+          "name": "clid",
+          "condition": "purpose",
+          "purpose": "newtab",
+          "value": "__MSG_param_newtab__"
+        }
+      ],
+      "search_url_get_params": "__MSG_searchUrlGetParams__"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/yandex/yandex-en.ico b/browser/components/search/extensions/yandex/yandex-en.ico
new file mode 100644
index 0000000000..d1c3f3f8b1
--- /dev/null
+++ b/browser/components/search/extensions/yandex/yandex-en.ico
diff --git a/browser/components/search/extensions/yandex/yandex-ru.ico b/browser/components/search/extensions/yandex/yandex-ru.ico
new file mode 100644
index 0000000000..eb187398c7
--- /dev/null
+++ b/browser/components/search/extensions/yandex/yandex-ru.ico