commit 30d158c260404e073c681f91838cc8ba4a650284 Author: Georg Koppen <gk@torproject.org> Date: Sat Mar 16 09:05:47 2019 +0000 squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Also fixes bug 29798 by making sure we only specify the Google search engine we actually ship an .xml file for. --- mobile/locales/search/list.json | 96 ++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/mobile/locales/search/list.json b/mobile/locales/search/list.json index 498e136182a9..a0ee93d4f7f7 100644 --- a/mobile/locales/search/list.json +++ b/mobile/locales/search/list.json @@ -247,49 +247,49 @@ "et": { "default": { "visibleDefaultEngines": [ - "google-b-m", "amazon-co-uk", "twitter", "wikipedia-et" + "google", "amazon-co-uk", "twitter", "wikipedia-et" ] } }, "eu": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "elebila", "wikipedia-eu" + "google", "bing", "elebila", "wikipedia-eu" ] } }, "fa": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "wikipedia-fa" + "google", "bing", "wikipedia-fa" ] } }, "ff": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-fr", "wikipedia-fr" + "google", "bing", "amazon-fr", "wikipedia-fr" ] } }, "fi": { "default": { "visibleDefaultEngines": [ - "google-b-m", "amazondotcom", "twitter", "wikipedia-fi" + "google", "amazondotcom", "twitter", "wikipedia-fi" ] } }, "fr": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "qwant", "twitter", "wikipedia-fr" + "google", "bing", "ddg", "qwant", "twitter", "wikipedia-fr" ] } }, "fy-NL": { "default": { "visibleDefaultEngines": [ - "google-b-m", "wikipedia-fy-NL", "bolcom-fy-NL" + "google", "wikipedia-fy-NL", "bolcom-fy-NL" ] }, "experimental-hidden": { @@ -301,133 +301,133 @@ "ga-IE": { "default": { "visibleDefaultEngines": [ - "google-b-m", "amazon-co-uk", "tearma", "twitter", "wikipedia-ga-IE" + "google", "amazon-co-uk", "tearma", "twitter", "wikipedia-ga-IE" ] } }, "gd": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "faclair-beag", "wikipedia-gd" + "google", "bing", "ddg", "faclair-beag", "wikipedia-gd" ] } }, "gl": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "twitter", "wikipedia-gl" + "google", "bing", "amazondotcom", "twitter", "wikipedia-gl" ] } }, "gn": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "twitter", "wikipedia-gn" + "google", "bing", "amazondotcom", "twitter", "wikipedia-gn" ] } }, "gu-IN": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "wikipedia-gu" + "google", "bing", "amazon-in", "wikipedia-gu" ] } }, "he": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "twitter", "wikipedia-he" + "google", "bing", "amazondotcom", "twitter", "wikipedia-he" ] } }, "hi-IN": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "twitter", "wikipedia-hi" + "google", "bing", "amazon-in", "twitter", "wikipedia-hi" ] } }, "hr": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "ddg", "twitter", "wikipedia-hr" + "google", "bing", "amazon-co-uk", "ddg", "twitter", "wikipedia-hr" ] } }, "hsb": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-de", "twitter", "wikipedia-hsb" + "google", "bing", "amazon-de", "twitter", "wikipedia-hsb" ] } }, "hu": { "default": { "visibleDefaultEngines": [ - "google-b-m", "sztaki-en-hu", "vatera", "twitter", "wikipedia-hu" + "google", "sztaki-en-hu", "vatera", "twitter", "wikipedia-hu" ] } }, "hy-AM": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "list-am", "wikipedia-hy-AM" + "google", "bing", "amazondotcom", "list-am", "wikipedia-hy-AM" ] } }, "ia": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia" + "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia" ] } }, "id": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "twitter", "wikipedia-id" + "google", "bing", "twitter", "wikipedia-id" ] } }, "is": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "leit-is", "wikipedia-is" + "google", "bing", "amazondotcom", "leit-is", "wikipedia-is" ] } }, "it": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "twitter", "wikipedia-it" + "google", "bing", "ddg", "twitter", "wikipedia-it" ] } }, "ja": { "default": { "visibleDefaultEngines": [ - "google-b-m", "amazon-jp", "bing", "twitter-ja", "wikipedia-ja", "yahoo-jp" + "google", "amazon-jp", "bing", "twitter-ja", "wikipedia-ja", "yahoo-jp" ] } }, "ka": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ka" + "google", "bing", "amazondotcom", "ddg", "wikipedia-ka" ] } }, "kab": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "wikipedia-kab" + "google", "bing", "wikipedia-kab" ] } }, "kk": { "default": { "visibleDefaultEngines": [ - "yandex", "google-b-m", "bing", "twitter", "wikipedia-kk" + "yandex", "google", "bing", "twitter", "wikipedia-kk" ] } }, @@ -558,42 +558,42 @@ "nn-NO": { "default": { "visibleDefaultEngines": [ - "google-b-m", "ddg", "gulesider-mobile-NO", "twitter", "wikipedia-NN" + "google", "ddg", "gulesider-mobile-NO", "twitter", "wikipedia-NN" ] } }, "oc": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "wikipedia-oc", "wiktionary-oc" + "google", "bing", "wikipedia-oc", "wiktionary-oc" ] } }, "or": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "wikipedia-or", "wiktionary-or" + "google", "bing", "amazon-in", "wikipedia-or", "wiktionary-or" ] } }, "pa-IN": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "wikipedia-pa" + "google", "bing", "wikipedia-pa" ] } }, "pl": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "twitter", "wikipedia-pl" + "google", "bing", "ddg", "twitter", "wikipedia-pl" ] } }, "pt-BR": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "twitter", "wikipedia-pt" + "google", "bing", "twitter", "wikipedia-pt" ] }, "experimental-hidden": { @@ -605,105 +605,105 @@ "pt-PT": { "default": { "visibleDefaultEngines": [ - "google-b-m", "wikipedia-pt" + "google", "wikipedia-pt" ] } }, "rm": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "leo_ende_de", "pledarigrond", "wikipedia-rm" + "google", "bing", "ddg", "leo_ende_de", "pledarigrond", "wikipedia-rm" ] } }, "ro": { "default": { "visibleDefaultEngines": [ - "google-b-m", "twitter", "wikipedia-ro" + "google", "twitter", "wikipedia-ro" ] } }, "ru": { "default": { "visibleDefaultEngines": [ - "google-b-m", "yandex-ru", "twitter", "wikipedia-ru" + "google", "yandex-ru", "twitter", "wikipedia-ru" ] } }, "sk": { "default": { "visibleDefaultEngines": [ - "google-b-m", "azet-sk", "slovnik-sk", "twitter", "wikipedia-sk" + "google", "azet-sk", "slovnik-sk", "twitter", "wikipedia-sk" ] } }, "sl": { "default": { "visibleDefaultEngines": [ - "google-b-m", "ceneje", "odpiralni", "twitter", "wikipedia-sl" + "google", "ceneje", "odpiralni", "twitter", "wikipedia-sl" ] } }, "son": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-fr", "twitter", "wikipedia-fr" + "google", "bing", "amazon-fr", "twitter", "wikipedia-fr" ] } }, "sq": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "twitter", "wikipedia-sq" + "google", "bing", "amazon-co-uk", "twitter", "wikipedia-sq" ] } }, "sr": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "twitter", "wikipedia-sr" + "google", "bing", "ddg", "twitter", "wikipedia-sr" ] } }, "sv-SE": { "default": { "visibleDefaultEngines": [ - "google-b-m", "prisjakt-sv-SE", "twitter", "wikipedia-sv-SE" + "google", "prisjakt-sv-SE", "twitter", "wikipedia-sv-SE" ] } }, "ta": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-ta", "wiktionary-ta" + "google", "bing", "amazon-in", "ddg", "wikipedia-ta", "wiktionary-ta" ] } }, "te": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "wikipedia-te", "wiktionary-te" + "google", "bing", "amazon-in", "wikipedia-te", "wiktionary-te" ] } }, "th": { "default": { "visibleDefaultEngines": [ - "google-b-m", "twitter", "wikipedia-th" + "google", "twitter", "wikipedia-th" ] } }, "tl": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "twitter" + "google", "bing", "amazondotcom", "ddg", "twitter" ] } }, "tr": { "default": { "visibleDefaultEngines": [ - "yandex-tr", "google-b-m", "twitter", "wikipedia-tr" + "yandex-tr", "google", "twitter", "wikipedia-tr" ] } }, @@ -774,7 +774,7 @@ "zh-TW": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-zh-TW" + "google", "bing", "ddg", "wikipedia-zh-TW" ] }, "experimental-hidden": {