summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Silva2017-04-23 10:34:36 -0300
committerAndré Silva2017-04-23 21:38:00 -0300
commitdaa5b38f089db427c20d890779ab83a5c454aa4b (patch)
tree522cc2540bec0347d6a5be4963eeba09b8581b2f
parent7e439ee6216ffcffd74f044ef2dfd72c468b1036 (diff)
downloadaur-daa5b38f089db427c20d890779ab83a5c454aa4b.tar.gz
Update to 1:53.0.deb1-1
-rw-r--r--.SRCINFO28
-rw-r--r--PKGBUILD37
-rw-r--r--distribution.ini9
-rw-r--r--libre.patch518
-rw-r--r--mozconfig10
-rw-r--r--vendor.js4
6 files changed, 203 insertions, 403 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ecc10954687a..046b62074962 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Apr 22 15:08:05 UTC 2017
+# Mon Apr 24 00:37:52 UTC 2017
pkgbase = iceweasel
- pkgdesc = A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox (Parabola rebranded).
- pkgver = 52.0.2.deb1
+ pkgdesc = A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox.
+ pkgver = 53.0.deb1
pkgrel = 1
epoch = 1
url = https://wiki.parabola.nu/iceweasel
@@ -56,10 +56,10 @@ pkgbase = iceweasel
options = !makeflags
options = !strip
options = debug
- source = http://ftp.debian.org/debian/pool/main//f/firefox/firefox_52.0.2.orig.tar.xz
- source = http://ftp.debian.org/debian/pool/main//f/firefox/firefox_52.0.2-1.debian.tar.xz
- source = https://repo.parabola.nu/other/iceweasel/iceweasel_52.0-2.branding.tar.xz
- source = https://repo.parabola.nu/other/iceweasel/iceweasel_52.0-2.branding.tar.xz.sig
+ source = http://ftp.debian.org/debian/pool/main//f/firefox/firefox_53.0.is.53.0.orig.tar.xz
+ source = http://ftp.debian.org/debian/pool/main//f/firefox/firefox_53.0.is.53.0-1.debian.tar.xz
+ source = https://github.com/coadde/iceweasel/raw/master/tarballs/iceweasel_53.0-1.branding.tar.xz
+ source = https://github.com/coadde/iceweasel/raw/master/tarballs/iceweasel_53.0-1.branding.tar.xz.sig
source = mozconfig
source = libre.patch
source = remove-default-and-shell-icons-in-packaging-manifest.patch
@@ -68,24 +68,22 @@ pkgbase = iceweasel
source = iceweasel.desktop
source = iceweasel-install-dir.patch
source = vendor.js
- source = distribution.ini
source = fix-wifi-scanner.diff
source = enable-object-directory-paths.patch
source = mozilla-1253216.patch
source = mozilla-build-arm.patch
- sha256sums = 0408956dfa3ab3728187394f567437f029f73603f1b295e01d5e64a2e4d1bf9e
- sha256sums = fe536e8b1c84301c4db505b1ea23926628b42e06122bd844230f1ee52f45fea3
- sha256sums = 30bce6326cdb9a6247f3325cfe326a51c4592728b254fc44656b96c06248ccd9
+ sha256sums = e77dbd8a4681481a5c9ab8ed3a5ac6c19caec8e25dc80f8b56461cfdf52d047a
+ sha256sums = bc8ef2662c571ee90b6b196372146a63c1895c56967dac2a4f7ec0b45802426b
+ sha256sums = b428ca162860cd8543fc1df8da6b21d4b52772ed69f4b9c1a49295f6986bb698
sha256sums = SKIP
- sha256sums = a0d75304583fab8d5ae830745d32ad9d04ca7098fd7202975f89df813f38479d
- sha256sums = 67e9430643cbecf69f1946fd84a5dda554fcdf1257896f9f828912b095daa08a
+ sha256sums = d17c6506c1755c89a48a9b26be28e3413c43eda6931a8e6eca2b44b99430f304
+ sha256sums = 9de91fdefb330e68af1765d7528e13b0d769cfef797e374b6f50e83ba17d40d6
sha256sums = 32f1fe3ad4f80d0ae419064db2abe49b97cd7cb18c35d68be1a2befb60172a2a
sha256sums = 93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd
sha256sums = 56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6
sha256sums = 250f7aaa3c1362f9d2bb2211cd605eab93a5e806e8540f184979d41acf46142a
sha256sums = 3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d
- sha256sums = 86f12cb438c93a0f019786de8be99bffc5f2f4926342bd567a3e4a1f4cef42ab
- sha256sums = d28b14a870aa100273243039d08ab9e64d325c28b6291413441146ebdf5d38ee
+ sha256sums = 90bdede15c2e85e5d081e2b822884a6354a116868ba7d9e19a2484a4e2528aaf
sha256sums = 9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8
sha256sums = e260e555b261aabab1e48786dd514eeea056e4402af7cfd4dfd1d32858441484
sha256sums = fbb6011501a74a8ea6d01c041870fcefb7ef2859c134aedc676e5f6452833f65
diff --git a/PKGBUILD b/PKGBUILD
index 13a8d5c1a936..15b6d31a489f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,12 +18,12 @@ _pgo=false
# We're getting this from Debian Sid
_debname=firefox
-_brandingver=52.0
-_brandingrel=2
-_debver=52.0.2
+_brandingver=53.0
+_brandingrel=1
+_debver=53.0
_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
-_parabolarepo=https://repo.parabola.nu/other/iceweasel
+_coadderepo=https://github.com/coadde/iceweasel/raw/master/tarballs
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=firefox
@@ -31,7 +31,7 @@ pkgname=iceweasel
epoch=1
pkgver=$_debver.$_debrel
pkgrel=1
-pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox (Parabola rebranded)."
+pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
arch=(i686 x86_64 armv7h)
license=(MPL GPL LGPL)
depends=(alsa-lib dbus-glib ffmpeg gtk2 gtk3 hunspell icu=58.2 libevent libvpx libxt mime-types mozilla-common nss sqlite startup-notification ttf-font)
@@ -49,10 +49,10 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
url="https://wiki.parabola.nu/$pkgname"
replaces=("$pkgname-libre" "$_pkgname")
conflicts=("$pkgname-libre")
-source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz"
- "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.xz"
- "$_parabolarepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz"
- "$_parabolarepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz.sig"
+source=("$_debrepo/`debfile $_debname`_$_debver.is.$_debver.orig.tar.xz"
+ "$_debrepo/`debfile $_debname`_$_debver.is.$_debver-${_debrel#deb}.debian.tar.xz"
+ "$_coadderepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz"
+ "$_coadderepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz.sig"
mozconfig
libre.patch
remove-default-and-shell-icons-in-packaging-manifest.patch
@@ -61,24 +61,22 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz"
$pkgname.desktop
$pkgname-install-dir.patch
vendor.js
- distribution.ini
fix-wifi-scanner.diff
enable-object-directory-paths.patch
mozilla-1253216.patch
mozilla-build-arm.patch)
-sha256sums=('0408956dfa3ab3728187394f567437f029f73603f1b295e01d5e64a2e4d1bf9e'
- 'fe536e8b1c84301c4db505b1ea23926628b42e06122bd844230f1ee52f45fea3'
- '30bce6326cdb9a6247f3325cfe326a51c4592728b254fc44656b96c06248ccd9'
+sha256sums=('e77dbd8a4681481a5c9ab8ed3a5ac6c19caec8e25dc80f8b56461cfdf52d047a'
+ 'bc8ef2662c571ee90b6b196372146a63c1895c56967dac2a4f7ec0b45802426b'
+ 'b428ca162860cd8543fc1df8da6b21d4b52772ed69f4b9c1a49295f6986bb698'
'SKIP'
- 'a0d75304583fab8d5ae830745d32ad9d04ca7098fd7202975f89df813f38479d'
- '67e9430643cbecf69f1946fd84a5dda554fcdf1257896f9f828912b095daa08a'
+ 'd17c6506c1755c89a48a9b26be28e3413c43eda6931a8e6eca2b44b99430f304'
+ '9de91fdefb330e68af1765d7528e13b0d769cfef797e374b6f50e83ba17d40d6'
'32f1fe3ad4f80d0ae419064db2abe49b97cd7cb18c35d68be1a2befb60172a2a'
'93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
'56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6'
'250f7aaa3c1362f9d2bb2211cd605eab93a5e806e8540f184979d41acf46142a'
'3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d'
- '86f12cb438c93a0f019786de8be99bffc5f2f4926342bd567a3e4a1f4cef42ab'
- 'd28b14a870aa100273243039d08ab9e64d325c28b6291413441146ebdf5d38ee'
+ '90bdede15c2e85e5d081e2b822884a6354a116868ba7d9e19a2484a4e2528aaf'
'9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8'
'e260e555b261aabab1e48786dd514eeea056e4402af7cfd4dfd1d32858441484'
'fbb6011501a74a8ea6d01c041870fcefb7ef2859c134aedc676e5f6452833f65'
@@ -145,7 +143,6 @@ prepare() {
# ARM-specific changes:
if [[ "$CARCH" == arm* ]]; then
- sed -i '/ac_add_options --enable-rust/d' .mozconfig
echo "ac_add_options --disable-ion" >> .mozconfig
echo "ac_add_options --disable-elf-hack" >> .mozconfig
echo "ac_add_options --disable-webrtc" >> .mozconfig
@@ -204,10 +201,6 @@ package() {
install -m644 "$srcdir/$pkgname.desktop" \
"$pkgdir/usr/share/applications"
- # Parabola rebranding
- install -m644 "$srcdir/distribution.ini" \
- "$pkgdir/usr/lib/$pkgname/distribution"
-
# Use system-provided dictionaries
rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation}
ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries"
diff --git a/distribution.ini b/distribution.ini
deleted file mode 100644
index 9246426e352c..000000000000
--- a/distribution.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[Global]
-id=parabola
-version=1.0
-about=Iceweasel for Parabola GNU/Linux-libre
-
-[Preferences]
-app.distributor=parabola
-app.distributor.channel=iceweasel
-app.partner.parabola=parabola
diff --git a/libre.patch b/libre.patch
index 65e65037e191..ecd1b2b3089e 100644
--- a/libre.patch
+++ b/libre.patch
@@ -1,5 +1,5 @@
diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css
-index c0b02e257..dc726d41a 100644
+index c0b02e2..dc726d4 100644
--- a/browser/base/content/abouthome/aboutHome.css
+++ b/browser/base/content/abouthome/aboutHome.css
@@ -354,26 +354,46 @@ body[narrow] #restorePreviousSession::before {
@@ -67,7 +67,7 @@ index c0b02e257..dc726d41a 100644
}
diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js
-index 50f3e01cd..5df008555 100644
+index 3c139b6..9d65edb 100644
--- a/browser/base/content/abouthome/aboutHome.js
+++ b/browser/base/content/abouthome/aboutHome.js
@@ -11,17 +11,13 @@
@@ -91,7 +91,7 @@ index 50f3e01cd..5df008555 100644
var searchText;
diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml
-index c288e732e..6d14ee773 100644
+index c288e73..6d14ee7 100644
--- a/browser/base/content/abouthome/aboutHome.xhtml
+++ b/browser/base/content/abouthome/aboutHome.xhtml
@@ -48,10 +48,6 @@
@@ -116,10 +116,10 @@ index c288e732e..6d14ee773 100644
</body>
</html>
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
-index 4dcd47c95..219019b20 100644
+index 11cd11d..494abdd 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
-@@ -31,7 +31,8 @@ browser.jar:
+@@ -27,7 +27,8 @@ browser.jar:
content/browser/abouthome/settings.png (content/abouthome/settings.png)
content/browser/abouthome/restore.png (content/abouthome/restore.png)
content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png)
@@ -129,7 +129,7 @@ index 4dcd47c95..219019b20 100644
content/browser/abouthome/snippet1@2x.png (content/abouthome/snippet1@2x.png)
content/browser/abouthome/snippet2@2x.png (content/abouthome/snippet2@2x.png)
content/browser/abouthome/downloads@2x.png (content/abouthome/downloads@2x.png)
-@@ -42,7 +43,6 @@ browser.jar:
+@@ -38,7 +39,6 @@ browser.jar:
content/browser/abouthome/settings@2x.png (content/abouthome/settings@2x.png)
content/browser/abouthome/restore@2x.png (content/abouthome/restore@2x.png)
content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png)
@@ -138,7 +138,7 @@ index 4dcd47c95..219019b20 100644
content/browser/aboutNetError.xhtml (content/aboutNetError.xhtml)
diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd
-index 7e3b57a79..6edc89d58 100644
+index 7e3b57a..6edc89d 100644
--- a/browser/locales/en-US/chrome/browser/aboutHome.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd
@@ -11,14 +11,6 @@
@@ -157,7 +157,7 @@ index 7e3b57a79..6edc89d58 100644
<!ENTITY abouthome.rightsSnippet "&brandFullName; is free and open source software from the non-profit Mozilla Foundation. <a>Know your rights…</a>">
diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
-index e078ed528..ce2c5ed4d 100644
+index e078ed5..ce2c5ed 100644
--- a/browser/locales/en-US/chrome/browser-region/region.properties
+++ b/browser/locales/en-US/chrome/browser-region/region.properties
@@ -3,17 +3,12 @@
@@ -208,45 +208,44 @@ index e078ed528..ce2c5ed4d 100644
+gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in
-index 5b7bdad69..19871732e 100644
+index 57de834..ccd5444 100644
--- a/browser/locales/generic/profile/bookmarks.html.in
+++ b/browser/locales/generic/profile/bookmarks.html.in
-@@ -5,17 +5,15 @@
+@@ -5,17 +5,13 @@
#define AB_CD ja
#endif
-#define mozilla_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gwMDAsTBZbkNwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAABNElEQVQ4y8WSsU0DURBE3yyWIaAJaqAAN4DPSL6AlIACKIEOyJEgRsIgOOkiInJqgAKowNg7BHdn7MOksNl+zZ//dvbDf5cAiklp22BdVtXdeTEpDYDB9m1VzU6OJuVp2NdEQCaI96fH2YHG4+mDduKYNMYINTcjcGbXzQVDEAphG0k48zUsajIbnAiMIXThpW8EICE0RAK4dvoKg9NIcTiQ589otyHOZLnwqK5nLwBFUZ4igc3iM0d1ff8CMC6mZ6Ihiaqq3gi1aUAnArD00SW1fq5OLBg0ymYmSZsR2/t4e/rGyCLW0sbp3oq+yTYqVgytQWui2FS7XYF7GFprY921T4CNQt8zr47dNzCkIX7y/jBtH+v+RGMQrc828W8pApnZbmEVQp/Ae7BlOy2ttib81/UFc+WRWEbjckIAAAAASUVORK5CYII=
-+#define parabola_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC
-
--#define nightly_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA01JREFUeNpkk01oXFUUx//vzp33ZiaTzkwnyUwmsbbNRpp0GhuVKiVgQIUiLmoX7lyIG10I6qIUrG6KGyuYZbMwiATqxipSMVhQYwWhiwSJwUxKkzbz8ZJ5H/M+7/vunUIE7Vnc1f3/zjn/c46wsCbjIOI4Rlfew+Zf6/h9+RYYYzj70hymZp7GULUCSin+H8IBwLYsfLOwiOfffndK1c2LmhO84jl+2e5ZCTN6Xer0fpp5dmq+frxy5zGAY9n49IOLuHDls8uqE3y07YV0ywwQGA6oZsJRFRT0FnK2Hpw8PTl/7tXZDw8ApF/29YUvufjqxxqLPrnLQBUiQRUI4EcQHQ+EgwbjENl8Pv3H9W/f//m7W9cOAKkXzr+J4pm5umy6S/uEkiAEOlzscWHG5jTbhcsrDJiHsN1CIScJTlc5JaSlldEna9uk8fcGHNO6tOMGqfssQjNFoHOxyAXU9xF5HiRXw2AqhuUEsLs6giCkjbXG549a+O3mMhQneLnthOh0NBiaAdozkTEdpC0Hnm2hKAKR3ESJRigNFZBHCF2zn+p7SMIwRM9kRcI/D5g2xAcd1PQeMtw8xkGuafIRGRgZKfHfCbKlIu5t3IVASYYDDtMzL85il2fLuh6qIkFkWtjrARY3zjENJLwCKgqwOjLcnW30Qh/HnpmGYTJhT1bSdPL0NBpr+6rbs8qhIiPivQtRhDDJQuCViI4BxdJRrx/jBopob25BDmIMnzgZjFTK+2R4tAo4+q8iM9Ba3wBTuxirHELeM5AxFO6FCsnSsHNnFfL9XUiFIo7ypNmB9D3eQkT665nS5Xm72Q5r3KCo04be2MIRKULOUlEkPnJpAbn8AI7XJyEUy/CBhIrJlUdT6D/rP3x1u1yQFjP5bFIbH4HdbHG2j/GJMfiqzneCwVI0oFrD8OgTiKLgl5Ubi0v/uYV3ZqcrE2ff+Do2/LlUxAi/HKQZH9eegupzpxDztL4gIfTU9d3VG+ev/nh7s6/797wiz1K3VpYuDU3MvFWunXg9ly2WTNVNDZaPgIU08V3NMNXVZfmfP68lvt187Br78d5r52hoKaUkiWspQqqHx4+OCQLhFu3KAXNbCYQWzR5SBCr5X3x/M+lrHgowAMP2wWqd+FzxAAAAAElFTkSuQmCC
+#define fsf_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC
--#define firefox_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAz5JREFUeNpcU0toXFUY/s49596588ikySSmM8rk0UkJEirVTVEjYk1NUdRFFgouXZQI2k2hUCjdiYIuCi4Kuig0DbqQYgU3Yi0iFRuRCBMwaZvMZDTNY95z3/fM8b8jldpzOeeee/i/737n+/+f4ZExf730rkiaZ9NJMx/nmk5HypMqqLr+ZuD4F67N5ZYejmfRsnvhyKsLhSs3zP70SubgYKHSdFENu+gXAprQIGnvBi5ez0m1b6u7M399+PTx+UvtCKtFi2F6195qXK2byir88esy5ksfYND5DhuhRCtUKBNB0Q7w5Z8ee2GgWdjOn250fn5v5j8F5dOHlZD0kWRgAwp3hrKY0S9BJWKIcQ5PShhNG4+1bHx+IocT+RXcrRSDMfFNRvvt3Oyp/icIrRhUl9hoO4kt3F55Bxf3LkLV20jWOohbDjzXxyc/lMH0cRSyCd1xq+dFhu986t7T0CUwIzB8EkW3O5ibhj44ib7NJhiBKRoB/aS4ZWHjbxtjGQYP7nGRTjim1SaQqYiAVAREpHG8vzWJn+6PQ6CF0HPR7nQQczpYeEWHyWMUkwU8MSECGwgJxAWp9xWKNzkuH3oet+JDlIE9Momedh1G4CN0bfhVG9nsS0BQQthJx0V7j3elq7ihqV5ezQTwZmodP9ZGkU/bOPr4Nr53xtDYsaD7Dg4nNqFaH5OCYSSdGhf7daNmuv6wEKqXk/yExKGBHSznFsH6FFpKQ/JAA0ulUejWLt44lkHXsqDaX6C6Nl4Rnq8vK8s/KThDMlJhkI91YOO+iR3XwEelCdTCBLSgijNzd6DLNfhlHfZ6FtWiWBQpq/V2LdSrrNPljBQkoOjuCiPxAMutOIbkPqYSEqeequGZaTLzdhZhS0PlnlB9bvhtr5CuHj3y2Qj8hVQ/kEopxONEEsO/0yATDYXYAdWrE69JEElXq7Hyk0tro+xBU1yZmr4xrIcvptIRCZlJJAYBmRGRkD08aivA7VDvWPqt564Xn41w/AHB1/u7l1/uGxGU8mNcgodUNDIq0JDeLnpzc1uo1Qr76rWbqyf/142PjsXJqdkmN2YDnQ9oGkJNU+t57q7qUv4y9/t64+HYfwQYAN7OczrzUDvGAAAAAElFTkSuQmCC
+-#define nightly_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA01JREFUeNpkk01oXFUUx//vzp33ZiaTzkwnyUwmsbbNRpp0GhuVKiVgQIUiLmoX7lyIG10I6qIUrG6KGyuYZbMwiATqxipSMVhQYwWhiwSJwUxKkzbz8ZJ5H/M+7/vunUIE7Vnc1f3/zjn/c46wsCbjIOI4Rlfew+Zf6/h9+RYYYzj70hymZp7GULUCSin+H8IBwLYsfLOwiOfffndK1c2LmhO84jl+2e5ZCTN6Xer0fpp5dmq+frxy5zGAY9n49IOLuHDls8uqE3y07YV0ywwQGA6oZsJRFRT0FnK2Hpw8PTl/7tXZDw8ApF/29YUvufjqxxqLPrnLQBUiQRUI4EcQHQ+EgwbjENl8Pv3H9W/f//m7W9cOAKkXzr+J4pm5umy6S/uEkiAEOlzscWHG5jTbhcsrDJiHsN1CIScJTlc5JaSlldEna9uk8fcGHNO6tOMGqfssQjNFoHOxyAXU9xF5HiRXw2AqhuUEsLs6giCkjbXG549a+O3mMhQneLnthOh0NBiaAdozkTEdpC0Hnm2hKAKR3ESJRigNFZBHCF2zn+p7SMIwRM9kRcI/D5g2xAcd1PQeMtw8xkGuafIRGRgZKfHfCbKlIu5t3IVASYYDDtMzL85il2fLuh6qIkFkWtjrARY3zjENJLwCKgqwOjLcnW30Qh/HnpmGYTJhT1bSdPL0NBpr+6rbs8qhIiPivQtRhDDJQuCViI4BxdJRrx/jBopob25BDmIMnzgZjFTK+2R4tAo4+q8iM9Ba3wBTuxirHELeM5AxFO6FCsnSsHNnFfL9XUiFIo7ypNmB9D3eQkT665nS5Xm72Q5r3KCo04be2MIRKULOUlEkPnJpAbn8AI7XJyEUy/CBhIrJlUdT6D/rP3x1u1yQFjP5bFIbH4HdbHG2j/GJMfiqzneCwVI0oFrD8OgTiKLgl5Ubi0v/uYV3ZqcrE2ff+Do2/LlUxAi/HKQZH9eegupzpxDztL4gIfTU9d3VG+ev/nh7s6/797wiz1K3VpYuDU3MvFWunXg9ly2WTNVNDZaPgIU08V3NMNXVZfmfP68lvt187Br78d5r52hoKaUkiWspQqqHx4+OCQLhFu3KAXNbCYQWzR5SBCr5X3x/M+lrHgowAMP2wWqd+FzxAAAAAElFTkSuQmCC
+#define gnu_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC
--#define bugzilla_icon data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnYCL7J0pY9wwETY9kYEM9AAAAAEBAYAhVVVUDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1bjTOS1Vb/wAA2/8JEqT/Q0g8kQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJnMqoiJtJ/0haST/NEkp/yQnW/8AAPD8AAHY/RsgP/JZUI+GKitih4ObUEAAAAAAAAAAAAAAAAAAAAAAKnouwip5Lv9ooW//a6Jz/y9GIv8JBXb/AADO/gEBvf8AAK7/FRJp/z9BfP8iLGj1AAAAAAAAAAAAAAAAL4YzwiB0I/+UwJ3/bK+C/02eZ/9CTjz/DBa1/wABxf8BAOj/AACp/w8Oc/sJCv//EhCN9AAAAAAAAAAANJA6iC2MMv93tYL/TZ5U/3mzjP9NoWr/NEss/wYIU/8CBOn/ARCX/wwNqP0TD6X/Cgyex5qacDAAAAAAAAAAADKUN/ZirWj/d76R/0SgXf9Ln1P/eLSM/1mda/8rOkb/CQiD/wMQvf8UEnT/MTAt4P//MwUhZyN8AAAAAAAAAAAznDf5UqlZ/228jP9NqnD/Qp9c/0yiVP+Dv5b/VaVw/0VxXf9PZXD/S3pQ/y54Nf8jcCf/I2wn/wAAAAA0ozjIM6E4/zOeOP+Uz6z/XLR+/06scv9BoV3/TqZX/4XBmP9XqHP/hr6Z/yp+Lf8leSr1JXUqbQAAAAA3rTz7Nqo7/zWmOqM3oz7rUK1W/43Mpf9etYD/T61z/0KjXf9Rqln/msup/46/lf8pgy7/JFg6sAAAAAAAAAAAOK8+8jqvOiMAAAAAAAAAADSlOv85pT//kM6o/2K5hP9Ysnv/YLJ2/ziXPv8piS3/V6Ri/yZQQ9wAAAAAAAAAAAAAAAAAAAAAAAAAADetP0E2qzz/OKg98UWsS/+e1K3/pNe4/4XDjv8ojy3/T7df/5fIqv8sjTH/K4kw/yqFLv8AAAAAAAAAAAAAAAA4sT3xN7A8+QAAAAA4qz3yNag6/zSlOf80oTn/csJ+/6/jwv9fjHj/MmRMdQAAAAAAAAAAAAAAAAAAAAAAAAAAOrdA/zm0QHQAAAAAAAAAADasO/k2qTvuRX5lpjqGT/gznDr/O3FXigAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADq9QiMAAAAAAAAAAAAAAAA4sj7/Nq09s0uOaSI1qTplM6U68wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrc//zu0P0EAAAAAOK4+UjWsPPgAAAAAAAAAAAAAAAAAAAAA/48AAP8HAAD4AQAA8AAAAOAAAADAAQAAwAMAAMAAAACAAwAAAAMAAHADAADwAAAA5AcAAO4HAAD+bwAA/u8AAA==
+-#define firefox_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAz5JREFUeNpcU0toXFUY/s49596588ikySSmM8rk0UkJEirVTVEjYk1NUdRFFgouXZQI2k2hUCjdiYIuCi4Kuig0DbqQYgU3Yi0iFRuRCBMwaZvMZDTNY95z3/fM8b8jldpzOeeee/i/737n+/+f4ZExf730rkiaZ9NJMx/nmk5HypMqqLr+ZuD4F67N5ZYejmfRsnvhyKsLhSs3zP70SubgYKHSdFENu+gXAprQIGnvBi5ez0m1b6u7M399+PTx+UvtCKtFi2F6195qXK2byir88esy5ksfYND5DhuhRCtUKBNB0Q7w5Z8ee2GgWdjOn250fn5v5j8F5dOHlZD0kWRgAwp3hrKY0S9BJWKIcQ5PShhNG4+1bHx+IocT+RXcrRSDMfFNRvvt3Oyp/icIrRhUl9hoO4kt3F55Bxf3LkLV20jWOohbDjzXxyc/lMH0cRSyCd1xq+dFhu986t7T0CUwIzB8EkW3O5ibhj44ib7NJhiBKRoB/aS4ZWHjbxtjGQYP7nGRTjim1SaQqYiAVAREpHG8vzWJn+6PQ6CF0HPR7nQQczpYeEWHyWMUkwU8MSECGwgJxAWp9xWKNzkuH3oet+JDlIE9Momedh1G4CN0bfhVG9nsS0BQQthJx0V7j3elq7ihqV5ezQTwZmodP9ZGkU/bOPr4Nr53xtDYsaD7Dg4nNqFaH5OCYSSdGhf7daNmuv6wEKqXk/yExKGBHSznFsH6FFpKQ/JAA0ulUejWLt44lkHXsqDaX6C6Nl4Rnq8vK8s/KThDMlJhkI91YOO+iR3XwEelCdTCBLSgijNzd6DLNfhlHfZ6FtWiWBQpq/V2LdSrrNPljBQkoOjuCiPxAMutOIbkPqYSEqeequGZaTLzdhZhS0PlnlB9bvhtr5CuHj3y2Qj8hVQ/kEopxONEEsO/0yATDYXYAdWrE69JEElXq7Hyk0tro+xBU1yZmr4xrIcvptIRCZlJJAYBmRGRkD08aivA7VDvWPqt564Xn41w/AHB1/u7l1/uGxGU8mNcgodUNDIq0JDeLnpzc1uo1Qr76rWbqyf/142PjsXJqdkmN2YDnQ9oGkJNU+t57q7qUv4y9/t64+HYfwQYAN7OczrzUDvGAAAAAElFTkSuQmCC
+#define libreplanet_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC
+-#define bugzilla_icon data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnYCL7J0pY9wwETY9kYEM9AAAAAEBAYAhVVVUDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1bjTOS1Vb/wAA2/8JEqT/Q0g8kQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJnMqoiJtJ/0haST/NEkp/yQnW/8AAPD8AAHY/RsgP/JZUI+GKitih4ObUEAAAAAAAAAAAAAAAAAAAAAAKnouwip5Lv9ooW//a6Jz/y9GIv8JBXb/AADO/gEBvf8AAK7/FRJp/z9BfP8iLGj1AAAAAAAAAAAAAAAAL4YzwiB0I/+UwJ3/bK+C/02eZ/9CTjz/DBa1/wABxf8BAOj/AACp/w8Oc/sJCv//EhCN9AAAAAAAAAAANJA6iC2MMv93tYL/TZ5U/3mzjP9NoWr/NEss/wYIU/8CBOn/ARCX/wwNqP0TD6X/Cgyex5qacDAAAAAAAAAAADKUN/ZirWj/d76R/0SgXf9Ln1P/eLSM/1mda/8rOkb/CQiD/wMQvf8UEnT/MTAt4P//MwUhZyN8AAAAAAAAAAAznDf5UqlZ/228jP9NqnD/Qp9c/0yiVP+Dv5b/VaVw/0VxXf9PZXD/S3pQ/y54Nf8jcCf/I2wn/wAAAAA0ozjIM6E4/zOeOP+Uz6z/XLR+/06scv9BoV3/TqZX/4XBmP9XqHP/hr6Z/yp+Lf8leSr1JXUqbQAAAAA3rTz7Nqo7/zWmOqM3oz7rUK1W/43Mpf9etYD/T61z/0KjXf9Rqln/msup/46/lf8pgy7/JFg6sAAAAAAAAAAAOK8+8jqvOiMAAAAAAAAAADSlOv85pT//kM6o/2K5hP9Ysnv/YLJ2/ziXPv8piS3/V6Ri/yZQQ9wAAAAAAAAAAAAAAAAAAAAAAAAAADetP0E2qzz/OKg98UWsS/+e1K3/pNe4/4XDjv8ojy3/T7df/5fIqv8sjTH/K4kw/yqFLv8AAAAAAAAAAAAAAAA4sT3xN7A8+QAAAAA4qz3yNag6/zSlOf80oTn/csJ+/6/jwv9fjHj/MmRMdQAAAAAAAAAAAAAAAAAAAAAAAAAAOrdA/zm0QHQAAAAAAAAAADasO/k2qTvuRX5lpjqGT/gznDr/O3FXigAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADq9QiMAAAAAAAAAAAAAAAA4sj7/Nq09s0uOaSI1qTplM6U68wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrc//zu0P0EAAAAAOK4+UjWsPPgAAAAAAAAAAAAAAAAAAAAA/48AAP8HAAD4AQAA8AAAAOAAAADAAQAAwAMAAMAAAACAAwAAAAMAAHADAADwAAAA5AcAAO4HAAD+bwAA/u8AAA==
+-
-#define mdn_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAA3XAAAN1wFCKJt4AAACYklEQVQ4y3WSTYjNYRTGf+f9/+/NuDN3GKMxt1mYpKR8RT6zEk1iyUo2IysSNspCxEIZRSN07YiUJSWkaUIZizELMzIZlO9h3MzXvf/341jcmTGa69RZvKfnPOc5z3mhQlRd651Ry17tqQQl5uR9ONHC3EtdiPPxWKZ24bhJvQV0OlBHhiV7pTs3WpUdEmeLrnWJAhhOtJA5/3RjqZg8Lrnwy4bQT/DvTb73Qt3N9ymATNvTU15Mvx8vfvTWDrmgT0y+dzuAZM527lM0Xx6jFKvnEKIYvIIqVeMFRCfEiDBWMw9UQUBUT8fBWvmrU9HEUpUWDq2cT23a0P6kQEqEwTFLQCBJpm9mYrV+6lW0ngNr62jb0kw6KvMeXJohZYSLzz9xvOMDJG6aPUKMtZPDObq+iXPbmoG/ooJC0QVaVy2g5AI3Bkq8/jYCkQEBo9ah1hESS1N1Gu9DxXNFRji0oYm+/Stoaa4tK0kcRq1HE4fxHqOKEf4bk16ubphd9iKxGKxFrcOWLB1vvuOCzmg0Irig1MxKMfBznPbOd2DLCmJNHKgSIdzr/kjXhwKbFtVPNQ+NJiw7+YDh0YTFuVr6CwLpaNJDjCYOtR61DldyHL7975c9dqeH4ZESscC7r79BFBI7kY5YrZsCC8qL/kFyR+6yY0UjS3M1PHz5ich71IOIQGSn0cskwdTeryTyfV9+jGzOP3rTQAiIHUNQEBkCeUbkcqguB2JEMGqt4sJlg8lGIsv0+p5dON8YaVgn3veJ85/F61YNtn5uXf3OCF0TQVacP0PiXMVzpfbemlnbna+I/QPSFTsRLd+hHAAAAABJRU5ErkJggg==
-
--#define addon_icon data:image/vndmicrosofticon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAKoSURBVDiNjZNLaJRnFIaf75vvy2UGTWr8NYkxl0IFUYkNXSSZQNWFWlxIEVy1FLLo0i4adddVXRnS4kJwYxci2GaRTWlSFGKFGRXNmFBF62VMO4TENBdjMv9k5p//Oy4SLzgqHs7yPc95eTlHiQjvqniPbVYRzuBoR+FQDEvId4neIPNCY945DayNVff/8NUvn9XXNJMv5hhKnTvYP3ymHmj/IMBSbmHjjP8fycxv+MEzGqtatUI1vK7R7wM4J32XUv3Li/l5imGBkbtXlsMw/PF1jXozg3iP3aM0Z8XRBFDr1fl7Og9EnTguXx30p/6fjAIozb/i6C4BdB2z6QOfH27ZUFNL0QUELs/tycs4J2zdGEerCADTM1P8df3PxyUZiKPF8zyGHpwGFLC6QCCRuYA4QQQ6mw4hjhYT77GN2qiBWFnV5sXc0xMAgfKx5foVYKURB2vLPbxoM8auODE6ws/fH+77dHtjhxp5OHzywpWf/IIsRk25Rq0CRFY4UVNNndkmqZFRf3YuWaYUS0aE3RP5MXX3/iCOgu3Y1WYfL90sdSDgxRoYTY5mZ2anjwC/AqEBdM4tMJ4dwYs1YiOGSBkYrVHqlQNxoC34OV8BdxK9gQ+guo7bwdYdrXu92nU6nR7Pzc/PSXxfazTj30IpRaWpIqbX4UQoBDkWJlRwLzVeLBTyGs2UcUX5duzvsfPqNpvDovQhnBIdELGaWFk1hclYmLx2fxmFbNm5qXJNvdi2DQ1WAsO1P/5petshyf6v25gJ0nxUUUeiP531s/kvAcor7MDOL2pjz3JzVKpqUoMTpb8QsSqdeTT98fomjyDv8LP5aKI3uAgQP2orCkGAVRVMZxbQhnQJIAzkm3s3Js6GSfkEQEd4+bpa8+TW71P1ANqoB65I93OA2DgV+Z+omgAAAABJRU5ErkJggg==
+-#define addon_icon data:image/vnd.microsoft.icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAKoSURBVDiNjZNLaJRnFIaf75vvy2UGTWr8NYkxl0IFUYkNXSSZQNWFWlxIEVy1FLLo0i4adddVXRnS4kJwYxci2GaRTWlSFGKFGRXNmFBF62VMO4TENBdjMv9k5p//Oy4SLzgqHs7yPc95eTlHiQjvqniPbVYRzuBoR+FQDEvId4neIPNCY945DayNVff/8NUvn9XXNJMv5hhKnTvYP3ymHmj/IMBSbmHjjP8fycxv+MEzGqtatUI1vK7R7wM4J32XUv3Li/l5imGBkbtXlsMw/PF1jXozg3iP3aM0Z8XRBFDr1fl7Og9EnTguXx30p/6fjAIozb/i6C4BdB2z6QOfH27ZUFNL0QUELs/tycs4J2zdGEerCADTM1P8df3PxyUZiKPF8zyGHpwGFLC6QCCRuYA4QQQ6mw4hjhYT77GN2qiBWFnV5sXc0xMAgfKx5foVYKURB2vLPbxoM8auODE6ws/fH+77dHtjhxp5OHzywpWf/IIsRk25Rq0CRFY4UVNNndkmqZFRf3YuWaYUS0aE3RP5MXX3/iCOgu3Y1WYfL90sdSDgxRoYTY5mZ2anjwC/AqEBdM4tMJ4dwYs1YiOGSBkYrVHqlQNxoC34OV8BdxK9gQ+guo7bwdYdrXu92nU6nR7Pzc/PSXxfazTj30IpRaWpIqbX4UQoBDkWJlRwLzVeLBTyGs2UcUX5duzvsfPqNpvDovQhnBIdELGaWFk1hclYmLx2fxmFbNm5qXJNvdi2DQ1WAsO1P/5petshyf6v25gJ0nxUUUeiP531s/kvAcor7MDOL2pjz3JzVKpqUoMTpb8QsSqdeTT98fomjyDv8LP5aKI3uAgQP2orCkGAVRVMZxbQhnQJIAzkm3s3Js6GSfkEQEd4+bpa8+TW71P1ANqoB65I93OA2DgV+Z+omgAAAABJRU5ErkJggg==
+#define hnode_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-@@ -27,30 +25,21 @@
+@@ -27,30 +23,14 @@
<dl><p>
<dt><h3 personal_toolbar_folder="true">@bookmarks_toolbarfolder@</h3></dt>
<dd>@bookmarks_toolbarfolder_description@
-#ifndef NIGHTLY_BUILD
<dl>
- <p><dt><a href="https://www.mozilla.org/@AB_CD@/firefox/central/" icon="@firefox_icon@">@getting_started@</a></dt>
-+ <p><dt><a href="https://www.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre</a></dt>
++ <p><dt><a href="https://www.fsf.org/" icon="@fsf_icon@">Free Software Foundation</a></dt>
</dl>
- <p><dt><h3>@firefox_heading@</h3></dt>
-+ <p><dt><h3>Parabola GNU/Linux-libre</h3></dt>
++ <p><dt><h3>Free Software Foundation</h3></dt>
<dl><p>
-- <dt><a href="https://www.mozilla.org/@AB_CD@/firefox/help/" icon="@mozilla_icon@">@firefox_help@</a>
+- <dt><a href="https://support.mozilla.org/@AB_CD@/products/firefox" icon="@mozilla_icon@">@firefox_help@</a>
- <dt><a href="https://www.mozilla.org/@AB_CD@/firefox/customize/" icon="@mozilla_icon@">@firefox_customize@</a>
- <dt><a href="https://www.mozilla.org/@AB_CD@/contribute/" icon="@mozilla_icon@">@firefox_community@</a>
- <dt><a href="https://www.mozilla.org/@AB_CD@/about/" icon="@mozilla_icon@">@firefox_about@</a>
@@ -254,14 +253,13 @@ index 5b7bdad69..19871732e 100644
-#else
- <dl>
- <p><dt><a href="https://www.mozilla.org/@AB_CD@/contribute/" icon="@mozilla_icon@">@firefox_community@</a>
-+ <dt><a href="https://www.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre</a>
-+ <dt><a href="https://www.parabola.nu/packages/" icon="@parabola_icon@">Parabola GNU/Linux-libre Packages</a>
-+ <dt><a href="https://wiki.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre Wiki</a>
-+ <dt><a href="https://labs.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre Labs</a>
++ <dt><a href="https://www.fsf.org/" icon="@fsf_icon@">Free Software Foundation</a>
++ <dt><a href="https://www.gnu.org/" icon="@gnu_icon@">The GNU Operating System and the Free Software Movement</a>
++ <dt><a href="https://libreplanet.org/" icon="@libreplanet_icon@">LibrePlanet</a>
++ <dt><a href="https://www.h-node.org/" icon="@hnode_icon@">h-node</a>
</dl>
- <p><dt><h3>@nightly_heading@</h3></dt>
-+ <p><dt><h3>Free Software Foundation</h3></dt>
- <dl><p>
+- <dl><p>
- <dt><a href="https://blog.nightly.mozilla.org/" icon="@nightly_icon@">@nightly_blog@</a>
- <dt><a href="https://bugzilla.mozilla.org/" icon="@bugzilla_icon@" shortcuturl="bz">@bugzilla@</a>
- <dt><a href="https://developer.mozilla.org/" icon="@mdn_icon@" shortcuturl="mdn">@mdn@</a>
@@ -269,18 +267,14 @@ index 5b7bdad69..19871732e 100644
- <dt><a href="about:crashes" icon="@mozilla_icon@">@crashes@</a>
- <dt><a href="https://mibbit.com/?server=irc.mozilla.org&channel=%23nightly" icon="@mozilla_icon@">@irc@</a>
- <dt><a href="https://planet.mozilla.org/" icon="@mozilla_icon@">@planet@</a>
-+ <dt><a href="https://www.fsf.org/" icon="@fsf_icon@">Free Software Foundation</a>
-+ <dt><a href="https://www.gnu.org/" icon="@gnu_icon@">The GNU Operating System and the Free Software Movement</a>
-+ <dt><a href="https://libreplanet.org/" icon="@libreplanet_icon@">LibrePlanet</a>
-+ <dt><a href="https://www.h-node.org/" icon="@hnode_icon@">h-node</a>
- </dl>
+- </dl>
-#endif
</dl>
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
-index eff09189b..6d76d20f0 100644
+index df2151a..fe2dcae 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
-@@ -98,7 +98,6 @@
+@@ -99,7 +99,6 @@
locale/browser/searchplugins/ (.deps/generated_@AB_CD@/*.xml)
locale/browser/searchplugins/list.json (.deps/generated_@AB_CD@/list.json)
#endif
@@ -289,41 +283,61 @@ index eff09189b..6d76d20f0 100644
locale/browser-region/region.properties (%chrome/browser-region/region.properties)
# the following files are browser-specific overrides
diff --git a/browser/locales/search/list.json b/browser/locales/search/list.json
-index 544740a43..4961e5437 100644
+index fdcbf99..a353d05 100644
--- a/browser/locales/search/list.json
+++ b/browser/locales/search/list.json
-@@ -1,880 +1,880 @@
+@@ -1,742 +1,732 @@
{
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "amazondotcom", "bing", "ddg", "twitter", "wikipedia"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
},
+ "regionOverrides": {
+ "US": {
+- "google": "google-nocodes"
+ },
+ "CA": {
+- "google": "google-nocodes"
+ },
+ "KZ": {
+- "google": "google-nocodes"
+ },
+ "BY": {
+- "google": "google-nocodes"
+ },
+ "RU": {
+- "google": "google-nocodes"
+ },
+ "TR": {
+- "google": "google-nocodes"
+ },
+ "UA": {
+- "google": "google-nocodes"
+ },
+ "CN": {
+- "google": "google-nocodes"
+ },
+ "TW": {
+- "google": "google-nocodes"
+ },
+ "HK": {
+- "google": "google-nocodes"
+ }
+ },
"locales": {
"en-US": {
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "amazondotcom", "bing", "ddg", "twitter", "wikipedia"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "US": {
- "visibleDefaultEngines": [
-- "yahoo", "google-nocodes", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "CA": {
- "visibleDefaultEngines": [
-- "google-nocodes", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
},
"experimental-hidden": {
"visibleDefaultEngines": [
- "yahoo-en-CA", "yandex-en"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -331,7 +345,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -339,7 +353,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-af"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -347,7 +361,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-es", "bing", "wikipedia-an", "ddg", "twitter"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -355,7 +369,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-ar"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -363,7 +377,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-in", "amazondotcom", "ddg", "wikipedia-as"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -371,7 +385,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-es", "bing", "diccionariu-alla", "ddg", "wikipedia-ast"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -379,7 +393,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "amazondotcom", "azerdict", "bing", "ddg", "wikipedia-az", "yandex-az"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -387,7 +401,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "diribg", "amazondotcom", "ddg", "portalbgdict", "wikipedia-bg"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -395,7 +409,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "bing", "ddg", "wikipedia-bn"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -403,7 +417,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-in", "amazondotcom", "bing", "ddg", "rediff", "wikipedia-bn"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -411,7 +425,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-france", "amazon-france", "ddg", "freelang", "klask", "wikipedia-br"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -419,7 +433,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "ddg", "olx", "twitter", "wikipedia-bs"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -427,7 +441,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "bing", "diec2", "ddg", "twitter", "wikipedia-ca"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -435,7 +449,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-espanol", "bing", "amazondotcom", "ddg", "wikipedia-es"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -443,7 +457,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "seznam-cz", "ddg", "heureka-cz", "mapy-cz", "wikipedia-cz"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -451,7 +465,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-en-GB", "amazon-en-GB", "ddg", "palasprint", "termau", "wikipedia-cy"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -459,7 +473,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "bing", "amazon-en-GB", "ddg", "wikipedia-da"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -467,7 +481,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-de", "amazondotcom-de", "bing", "ddg", "leo_ende_de", "wikipedia-de"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -475,7 +489,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-de", "bing", "amazondotcom-de", "ddg", "leo_ende_de", "wikipedia-dsb"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -483,7 +497,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "amazon-en-GB", "bing", "ddg", "wikipedia-el"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -491,13 +505,13 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-en-GB", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "twitter", "wikipedia"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
},
"experimental-hidden": {
"visibleDefaultEngines": [
- "yandex-en"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -505,7 +519,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -513,7 +527,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "bing", "amazondotcom", "ddg", "reta-vortaro", "wikipedia-eo"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -521,7 +535,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-ar", "amazondotcom", "drae", "ddg", "mercadolibre-ar", "wikipedia-es"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -529,7 +543,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-cl", "bing", "drae", "ddg", "mercadolibre-cl", "wikipedia-es"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -537,7 +551,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-es", "bing", "drae", "ddg", "twitter", "wikipedia-es"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -545,7 +559,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-mx", "bing", "ddg", "mercadolibre-mx", "wikipedia-es"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -553,7 +567,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "neti-ee", "ddg", "osta-ee", "wikipedia-et", "eki-ee"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -561,7 +575,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "bing", "amazon-en-GB", "ddg", "elebila", "wikipedia-eu"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -569,7 +583,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "amazondotcom", "bing", "ddg", "wikipedia-fa"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -577,7 +591,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-france", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -585,7 +599,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-fi", "bing", "bookplus-fi", "ddg", "wikipedia-fi"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -593,7 +607,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-france", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -601,7 +615,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-fy-NL", "bing", "bolcom-fy-NL", "ddg", "marktplaats-fy-NL", "wikipedia-fy-NL"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -609,7 +623,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-en-GB", "amazon-en-GB", "ddg", "tearma", "twitter", "wikipedia-ga-IE"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -617,7 +631,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-en-GB", "faclair-beag", "amazon-en-GB", "bbc-alba", "ddg", "wikipedia-gd"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -625,7 +639,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-es", "amazon-en-GB", "ddg", "wikipedia-gl"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -633,7 +647,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-es", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-gn"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -641,7 +655,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-in", "bing", "ddg", "gujaratilexicon", "wikipedia-gu"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -649,7 +663,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "ddg", "wikipedia-he", "morfix-dic"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -657,7 +671,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-in", "bing", "ddg", "wikipedia-hi"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -665,7 +679,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -673,7 +687,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-de", "bing", "amazondotcom-de", "ddg", "leo_ende_de", "wikipedia-hsb"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -681,7 +695,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "ddg", "sztaki-en-hu", "vatera", "wikipedia-hu"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -689,7 +703,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "amazondotcom", "ddg", "list-am", "wikipedia-hy"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -697,7 +711,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-id", "ddg", "wikipedia-id"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -705,7 +719,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "bing", "amazondotcom", "ddg", "leit-is", "wikipedia-is"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -713,7 +727,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-it", "bing", "amazon-it", "ddg", "hoepli", "wikipedia-it"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -721,7 +735,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -729,7 +743,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -737,7 +751,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ka"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -745,7 +759,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-france", "bing", "ddg", "wikipedia-kab"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -753,37 +767,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "yandex-kk", "google", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "KZ": {
- "visibleDefaultEngines": [
-- "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "BY": {
- "visibleDefaultEngines": [
-- "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "RU": {
- "visibleDefaultEngines": [
-- "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "TR": {
- "visibleDefaultEngines": [
-- "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "UA": {
- "visibleDefaultEngines": [
-- "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -791,7 +775,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-km"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -799,7 +783,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-in", "bing", "amazondotcom", "ddg", "kannadastore", "wikipedia-kn"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -807,7 +791,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "ddg", "naver-kr", "danawa-kr", "daum-kr", "wikipedia-kr"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -815,7 +799,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-it", "bing", "amazon-it", "ddg", "paroledigenova-lij", "wikipedia-lij"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -823,7 +807,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "wikipedia-lt", "bing", "amazondotcom", "ddg", "twitter"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -831,7 +815,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-lv"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -839,7 +823,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-lv"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -847,7 +831,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-in", "bing", "ddg", "twitter", "wikipedia-hi"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -855,7 +839,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-mk"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -863,7 +847,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "webdunia", "bing", "ddg", "rediff", "wikipedia", "wikipedia-ml"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -871,7 +855,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-in", "amazondotcom", "ddg", "rediff", "wikipedia-mr"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -879,7 +863,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ms"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -887,7 +871,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-my"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -895,7 +879,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-NO", "amazon-en-GB", "bing", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -903,7 +887,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "bing", "ddg", "twitter", "wikipedia-ne"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -911,7 +895,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "bing", "bolcom-nl", "ddg", "marktplaats-nl", "wikipedia-nl"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -919,7 +903,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "bing", "amazon-en-GB", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -927,7 +911,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-in", "bing", "amazondotcom", "ddg", "wikipedia-or"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -935,7 +919,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-in", "bing", "ddg", "wikipedia-pa"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -943,7 +927,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "allegro-pl", "ddg", "pwn-pl", "wikipedia-pl", "wolnelektury-pl"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -951,7 +935,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-br", "bing", "buscape", "ddg", "mercadolivre", "twitter", "wikipedia-pt"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -959,7 +943,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "amazon-en-GB", "ddg", "priberam", "sapo", "wikipedia-pt"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -967,7 +951,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-ch", "bing", "ddg", "leo_ende_de-rm", "pledarigrond", "wikipedia-rm"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -975,7 +959,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipediaro"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -983,37 +967,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "yandex-ru", "google", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "RU": {
- "visibleDefaultEngines": [
-- "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "BY": {
- "visibleDefaultEngines": [
-- "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "KZ": {
- "visibleDefaultEngines": [
-- "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "TR": {
- "visibleDefaultEngines": [
-- "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "UA": {
- "visibleDefaultEngines": [
-- "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1021,7 +975,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "amazondotcom", "ddg", "wikipedia-si"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1029,7 +983,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "azet-sk", "atlas-sk", "ddg", "dunaj-sk", "slovnik-sk", "wikipedia-sk", "zoznam-sk"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1037,7 +991,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "ceneji", "ddg", "najdi-si", "odpiralni", "twitter", "wikipedia-sl"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1045,7 +999,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-france", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1053,7 +1007,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "bing", "amazon-en-GB", "ddg", "wikipedia-sq"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1061,7 +1015,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "amazon-en-GB", "bing", "ddg", "wikipedia-sr", "pogodak"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1069,7 +1023,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-sv-SE", "bing", "allaannonser-sv-SE", "ddg", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1077,7 +1031,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-in", "ddg", "wikipedia-ta"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1085,7 +1039,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-in", "amazondotcom", "ddg", "wikipedia-te", "wiktionary-te"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1093,7 +1047,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "amazondotcom", "bing", "ddg", "longdo", "wikipedia-th"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1101,7 +1055,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-tl", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-tl"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1109,37 +1063,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "yandex-tr", "google", "ddg", "twitter", "wikipedia-tr"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "TR": {
- "visibleDefaultEngines": [
-- "yandex-tr", "google-nocodes", "ddg", "twitter", "wikipedia-tr"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "BY": {
- "visibleDefaultEngines": [
-- "yandex-tr", "google-nocodes", "ddg", "twitter", "wikipedia-tr"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "KZ": {
- "visibleDefaultEngines": [
-- "yandex-tr", "google-nocodes", "ddg", "twitter", "wikipedia-tr"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "RU": {
- "visibleDefaultEngines": [
-- "yandex-tr", "google-nocodes", "ddg", "twitter", "wikipedia-tr"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "UA": {
- "visibleDefaultEngines": [
-- "yandex-tr", "google-nocodes", "ddg", "twitter", "wikipedia-tr"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1147,37 +1071,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "UA": {
- "visibleDefaultEngines": [
-- "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "TR": {
- "visibleDefaultEngines": [
-- "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "BY": {
- "visibleDefaultEngines": [
-- "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "KZ": {
- "visibleDefaultEngines": [
-- "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "RU": {
- "visibleDefaultEngines": [
-- "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1185,7 +1079,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-in", "bing", "amazon-in", "ddg", "twitter", "wikipedia-ur"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1193,7 +1087,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-uz"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1201,7 +1095,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "ddg", "wikipedia-vi", "zing-mp3"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1209,7 +1103,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-wo"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1217,7 +1111,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "google", "bing", "ddg", "wikipedia"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1225,67 +1119,7 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "baidu", "google", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "CN": {
- "visibleDefaultEngines": [
-- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "TW": {
- "visibleDefaultEngines": [
-- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "HK": {
- "visibleDefaultEngines": [
-- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "US": {
- "visibleDefaultEngines": [
-- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "CA": {
- "visibleDefaultEngines": [
-- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "KZ": {
- "visibleDefaultEngines": [
-- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "BY": {
- "visibleDefaultEngines": [
-- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "RU": {
- "visibleDefaultEngines": [
-- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "TR": {
- "visibleDefaultEngines": [
-- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "UA": {
- "visibleDefaultEngines": [
-- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
},
@@ -1293,24 +1127,12 @@ index 544740a43..4961e5437 100644
"default": {
"visibleDefaultEngines": [
- "yahoo-zh-TW", "google", "ddg", "findbook-zh-TW", "wikipedia-zh-TW", "yahoo-zh-TW-HK", "yahoo-bid-zh-TW", "yahoo-answer-zh-TW"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "TW": {
- "visibleDefaultEngines": [
-- "yahoo-zh-TW", "google-nocodes", "ddg", "findbook-zh-TW", "wikipedia-zh-TW", "yahoo-zh-TW-HK", "yahoo-bid-zh-TW", "yahoo-answer-zh-TW"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "HK": {
- "visibleDefaultEngines": [
-- "yahoo-zh-TW-HK", "google-nocodes", "ddg", "findbook-zh-TW", "wikipedia-zh-TW", "yahoo-zh-TW", "yahoo-bid-zh-TW", "yahoo-answer-zh-TW"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
++ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "searx", "seeks", "wikipedia-en", "yacy"
]
}
}
diff --git a/devtools/client/locales/en-US/connection-screen.dtd b/devtools/client/locales/en-US/connection-screen.dtd
-index 674a408d5..d27e97fd5 100644
+index 674a408..d27e97f 100644
--- a/devtools/client/locales/en-US/connection-screen.dtd
+++ b/devtools/client/locales/en-US/connection-screen.dtd
@@ -24,7 +24,7 @@
@@ -1323,7 +1145,7 @@ index 674a408d5..d27e97fd5 100644
<!ENTITY remoteHelpSuffix ".">
diff --git a/devtools/client/locales/en-US/sourceeditor.properties b/devtools/client/locales/en-US/sourceeditor.properties
-index 842d549f0..31dcb82e5 100644
+index 842d549..31dcb82 100644
--- a/devtools/client/locales/en-US/sourceeditor.properties
+++ b/devtools/client/locales/en-US/sourceeditor.properties
@@ -4,7 +4,7 @@
@@ -1336,10 +1158,10 @@ index 842d549f0..31dcb82e5 100644
# LOCALIZATION NOTE The correct localization of this file might be to keep it
diff --git a/devtools/client/locales/en-US/toolbox.dtd b/devtools/client/locales/en-US/toolbox.dtd
-index 6097fa82a..3dfe372db 100644
+index d248ae5..9b3df50 100644
--- a/devtools/client/locales/en-US/toolbox.dtd
+++ b/devtools/client/locales/en-US/toolbox.dtd
-@@ -93,7 +93,7 @@
+@@ -80,7 +80,7 @@
- checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
- boolean preference in about:config, in the options panel. -->
<!ENTITY options.enableRemote.label3 "Enable remote debugging">
@@ -1349,7 +1171,7 @@ index 6097fa82a..3dfe372db 100644
<!-- LOCALIZATION NOTE (options.enableWorkers.label): This is the label for the
- checkbox that toggles worker debugging, i.e. devtools.debugger.workers
diff --git a/devtools/client/locales/en-US/webide.dtd b/devtools/client/locales/en-US/webide.dtd
-index 5e1a80ccd..8f375da2e 100644
+index 750bb55..7adc82d 100644
--- a/devtools/client/locales/en-US/webide.dtd
+++ b/devtools/client/locales/en-US/webide.dtd
@@ -2,7 +2,7 @@
@@ -1361,7 +1183,7 @@ index 5e1a80ccd..8f375da2e 100644
<!ENTITY projectMenu_label "Project">
<!ENTITY projectMenu_accesskey "P">
-@@ -59,7 +59,7 @@
+@@ -57,7 +57,7 @@
<!ENTITY projectButton_label "Open App">
<!ENTITY runtimeButton_label "Select Runtime">
@@ -1371,7 +1193,7 @@ index 5e1a80ccd..8f375da2e 100644
<!ENTITY key_quit "W">
<!-- open menu -->
diff --git a/devtools/client/locales/en-US/webide.properties b/devtools/client/locales/en-US/webide.properties
-index 2368ad7f1..05e39c74f 100644
+index 2368ad7..05e39c7 100644
--- a/devtools/client/locales/en-US/webide.properties
+++ b/devtools/client/locales/en-US/webide.properties
@@ -2,8 +2,8 @@
diff --git a/mozconfig b/mozconfig
index 5c556437ec53..837b781a3666 100644
--- a/mozconfig
+++ b/mozconfig
@@ -4,11 +4,13 @@ ac_add_options --prefix=/usr
ac_add_options --enable-release
ac_add_options --enable-gold
ac_add_options --enable-pie
-ac_add_options --enable-rust
# Iceweasel
ac_add_options --disable-official-branding
ac_add_options --with-branding=debian/branding
+ac_add_options --disable-safe-browsing
+ac_add_options --disable-url-classifier
+ac_add_options --disable-eme
# System libraries
ac_add_options --with-system-nspr
@@ -32,12 +34,6 @@ ac_add_options --disable-crashreporter
STRIP_FLAGS="--strip-debug"
-# Parabola features
-ac_add_options --with-distribution-id=nu.parabola
-ac_add_options --disable-safe-browsing
-ac_add_options --disable-url-classifier
-ac_add_options --disable-eme
-
# Other
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
diff --git a/vendor.js b/vendor.js
index 3736917f30f8..b2c8411ada85 100644
--- a/vendor.js
+++ b/vendor.js
@@ -68,9 +68,9 @@ pref("browser.EULA.override", true);
// Spoof the useragent to a generic one
pref("general.useragent.compatMode.firefox", true);
// Spoof the useragent to a generic one
-pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:52.0) Gecko/20100101 Firefox/52.0");
+pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:53.0) Gecko/20100101 Firefox/53.0");
pref("general.appname.override", "Netscape");
-pref("general.appversion.override", "52.0");
+pref("general.appversion.override", "53.0");
pref("general.buildID.override", "Gecko/20100101");
pref("general.oscpu.override", "Windows NT 6.1");
pref("general.platform.override", "Win32");