diff --git a/helpers/DATA/firefox/extensions/uBlock0@raymondhill.net.xpi b/helpers/DATA/firefox/extensions/uBlock0@raymondhill.net.xpi
index 126409294a56f5815302dc510cac1f091d4e087e..794c3be8526a64270bede8de689218bffa4b1825 100644
Binary files a/helpers/DATA/firefox/extensions/uBlock0@raymondhill.net.xpi and b/helpers/DATA/firefox/extensions/uBlock0@raymondhill.net.xpi differ
diff --git a/helpers/DATA/firefox/searchplugins/searchplugins.conf b/helpers/DATA/firefox/searchplugins/searchplugins.conf
index d56cd96c1ca8c3a5cb3925c5be0e589e68462a26..f848056014229667ceb8ebf428c7efb9aa51e2a7 100644
--- a/helpers/DATA/firefox/searchplugins/searchplugins.conf
+++ b/helpers/DATA/firefox/searchplugins/searchplugins.conf
@@ -3,19 +3,18 @@
{
"name": "Amazon",
"include_locales": [ "af", "ar", "as", "az", "bg", "bn-IN", "br", "cak", "cy", "da", "de", "el", "en-GB", "en-US", "en-ZA", "eo", "es-AR", "eu", "fa", "fr", "ga-IE", "gd", "gl", "gn", "hr", "hsb", "hy-AM", "is", "it", "ja", "ka", "km", "kn", "ku", "lt", "mk", "mr", "ms", "my", "nb-NO", "nn-NO", "or", "pt-PT", "ro", "si", "son", "sq", "sr", "te", "th", "ur", "uz", "zh-CN", "zu"],
-
"exclude_locales": [],
- "match": "amazon*.xml",
+ "match": "amazondotcom.xml",
"source": "en-US/amazondotcom.xml",
"locale_specific": [
{
- "locales": [ "br", "fr", "oc" ],
- "match": "amazon*.xml",
+ "locales": [ "br", "fr", "son" ],
+ "match": "amazon-france.xml",
"source": "fr/amazon-france.xml"
},
{
"locales": [ "cy", "da", "el", "en-GB", "eu", "ga-IE", "gd", "gl", "hr", "nb-NO", "nn-NO", "pt-PT", "sq", "sr" ],
- "match": "amazon*.xml",
+ "match": "amazon-en-GB.xml",
"source": "en-GB/amazon-en-GB.xml"
},
{
@@ -33,6 +32,11 @@
"match": "amazon-jp.xml",
"source": "ja/amazon-jp.xml"
},
+ {
+ "locales": [ "ur" ],
+ "match": "amazon-in.xml",
+ "source": "ur/amazon-in.xml"
+ },
{
"locales": [ "zh-CN" ],
"match": "amazondotcn.xml",
@@ -58,25 +62,8 @@
"name": "Google",
"include_locales": [ "*" ],
"exclude_locales": [],
- "match": "google*.xml",
- "source": "en-US/google.xml",
- "locale_specific": [
- {
- "locales": [ "en-GB" ],
- "match": "google.xml",
- "source": "en-GB/google.xml"
- },
- {
- "locales": [ "en-ZA" ],
- "match": "google.xml",
- "source": "en-ZA/google.xml"
- },
- {
- "locales": [ "ku" ],
- "match": "google.xml",
- "source": "ku/google-ku.xml"
- }
- ]
+ "match": "google.xml",
+ "source": "en-US/google.xml"
}
],
"additions": [
diff --git a/helpers/DATA/firefox/settings.js b/helpers/DATA/firefox/settings.js
index de105b6848d95276d3cb3201d81da864bda6ef5b..de73aedf716e7e5bc145b67980d276da683a596a 100644
--- a/helpers/DATA/firefox/settings.js
+++ b/helpers/DATA/firefox/settings.js
@@ -1,11 +1,12 @@
// Release notes and vendor URLs
-pref("app.releaseNotesURL", "http://trisquel.info/browser");
-pref("app.vendorURL", "http://trisquel.info/browser");
+pref("app.releaseNotesURL", "https://trisquel.info/en/wiki/abrowser-help");
+pref("app.vendorURL", "https://trisquel.info/en/wiki/abrowser-help");
+pref("privacy.trackingprotection.introURL", "https://trisquel.info/en/wiki/abrowser-help");
// PFS url
-pref("pfs.datasource.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
-pref("pfs.filehint.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
+pref("pfs.datasource.url", "https://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
+pref("pfs.filehint.url", "https://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
// I'm feeling Ducky.
pref("keyword.URL", "https://duckduckgo.com/?t=trisquel&q=!+");
@@ -58,22 +59,22 @@ pref("general.useragent.compatMode.firefox",true);
// Startup pages
//pref ("browser.startup.page" , 3);
-//pref ("browser.startup.homepage" , "http://trisquel.info");
-//pref ("startup.homepage_welcome_url", "http://trisquel.info/welcome");
-//pref ("startup.homepage_override_url" , "http://trisquel.info/newbrowser");
+//pref ("browser.startup.homepage" , "https://trisquel.info");
+//pref ("startup.homepage_welcome_url", "https://trisquel.info/welcome");
+//pref ("startup.homepage_override_url" , "https://trisquel.info/newbrowser");
pref ("browser.startup.homepage_override.mstone", "ignore");
// Preferences for the Get Add-ons panel
pref ("extensions.webservice.discoverURL", "https://trisquel.info/browser-plain");
-pref ("extensions.getAddons.search.url", "http://trisquel.info");
+pref ("extensions.getAddons.search.url", "https://trisquel.info");
// Help URL
-pref ("app.support.baseURL", "http://trisquel.info/wiki/");
+pref ("app.support.baseURL", "https://trisquel.info/wiki/");
pref ("app.support.inputURL", "https://trisquel.info/contact");
pref ("app.feedback.baseURL", "https://trisquel.info/contact");
-pref ("browser.uitour.url", "http://trisquel.info/browser");
-pref ("plugins.update.url", "http://trisquel.info/browser");
-pref ("browser.customizemode.tip0.learnMoreUrl", "http://trisquel.info/browser");
+pref ("browser.uitour.url", "https://trisquel.info/en/wiki/abrowser-help");
+pref ("plugins.update.url", "https://trisquel.info/en/wiki/abrowser-help");
+pref ("browser.customizemode.tip0.learnMoreUrl", "https://trisquel.info/en/wiki/abrowser-help");
// Dictionary download preference
pref("browser.dictionaries.download.url", "http://dictionaries.mozdev.org/");
@@ -98,7 +99,7 @@ pref("privacy.donottrackheader.value", 1);
pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled", false);
pref("browser.safebrowsing.enabled", false);
pref("browser.safebrowsing.malware.enabled", false);
-pref("services.sync.privacyURL", "http://trisquel.info/en/legal");
+pref("services.sync.privacyURL", "https://trisquel.info/en/legal");
pref("social.enabled", false);
pref("social.remote-install.enabled", false);
pref("datareporting.policy.dataSubmissionEnabled", false);
@@ -194,3 +195,18 @@ pref("xpinstall.signatures.required", false);
// disable screenshots extension
pref("extensions.screenshots.disabled", true);
+pref("browser.onboarding.newtour", "performance,private,addons,customize,default");
+pref("browser.onboarding.updatetour", "performance,library,singlesearch,customize");
+
+// Disable rating bar
+pref("browser.onboarding.enabled", false);
+
+// New tab settings
+pref("browser.newtabpage.activity-stream.default.sites", "https://www.trisquel.info/,https://www.gnu.org/,https://www.fsf.org/,https://libreplanet.org/,https://www.wikipedia.org/,https://www.wikinews.org/"):
+pref("browser.newtabpage.activity-stream.showTopSites",false);
+pref("browser.newtabpage.activity-stream.feeds.section.topstories",false);
+pref("browser.newtabpage.activity-stream.feeds.snippets",false);
+
+// Enable xrender
+pref("gfx.xrender.enabled",true);
+
diff --git a/helpers/DATA/firefox/update-extensions.sh b/helpers/DATA/firefox/update-extensions.sh
index 6648612acd613311312623c3258f1e38d0695cc4..fa70f9cf40853c867ffce8c7cbd845ba41200f2f 100644
--- a/helpers/DATA/firefox/update-extensions.sh
+++ b/helpers/DATA/firefox/update-extensions.sh
@@ -9,7 +9,7 @@ mkdir /tmp/update-extension
(cd /tmp/update-extension
wget -O extension.xpi https://addons.mozilla.org/firefox/downloads/latest/$extension/addon-${extension}-latest.xpi
unzip extension.xpi
-rm extension.xpi)
+)
if [ -f /tmp/update-extension/install.rdf ]; then
@@ -19,7 +19,7 @@ if [ -f /tmp/update-extension/manifest.json ]; then
ID=$(grep '"id":' /tmp/update-extension/manifest.json |head -n1|cut -d \" -f 4)
fi
-rm -rf extensions/$ID
-mv /tmp/update-extension extensions/$ID
+mv /tmp/update-extension/extension.xpi extensions/$ID.xpi
+
done
diff --git a/helpers/make-firefox b/helpers/make-firefox
index 7d77dff98d3a6ca710d53f9ad96442abadb645f2..66cd0410fe929265b51d10346548e3219226a016 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -160,10 +160,11 @@ MOZILLA_REPO = http://hg.mozilla.org/releases/mozilla-release
L10N_REPO = http://hg.mozilla.org/releases/l10n/mozilla-release
EOF
+cp $DATA/branding/content/identity-icons-brand.svg ./browser/extensions/onboarding/content/img/watermark.svg
+
# Replace about:home
rm browser/base/content/abouthome -rf
cp $DATA/abouthome -a browser/base/content
-sed '/mozilla.*svg/d' -i ./browser/base/jar.mn
sed '/abouthome/s/*/ /' -i ./browser/base/jar.mn
# Delete stuff we don't use and that may contain trademaked logos
@@ -230,7 +231,7 @@ replace "Trisquel Corporation" "Mozilla Corporation" .
replace "abrowser.com" "firefox.com" .
#sed -i 's/iceweasel, abrowser, icecat,/iceweasel, firefox, icecat,/g' debian/control.in
sed '/Provides/s/abrowser-locale/firefox-locale/' -i debian/control.langpacks
-sed 's/Abrowser/Firefox/' -i third_party/rust/idna/src/lib.rs
+sed 's/Abrowser/Firefox/' -i third_party/rust/idna/src/lib.rs third_party/rust/encoding_rs/.travis.yml third_party/rust/encoding_rs/README.md
sed 's/Trisquel/Mozilla/' -i third_party/rust/encoding_rs/src/lib.rs browser/components/uitour/UITour-lib.js
# Restore useragent to Firefox