firefox: update patches for current release.
This commit is contained in:
parent
06a3cb2c23
commit
4e2896e48c
2 changed files with 28 additions and 46 deletions
|
|
@ -1,8 +1,8 @@
|
||||||
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
|
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
|
||||||
index 391bc93e..a7d93085 100644
|
index 391bc93e..df6b3f84 100644
|
||||||
--- a/browser/app/profile/firefox.js
|
--- a/browser/app/profile/firefox.js
|
||||||
+++ b/browser/app/profile/firefox.js
|
+++ b/browser/app/profile/firefox.js
|
||||||
@@ -1718,27 +1718,27 @@ pref("browser.topsites.component.enabled", false);
|
@@ -1718,19 +1718,19 @@ pref("browser.topsites.component.enabled", false);
|
||||||
|
|
||||||
pref("browser.topsites.useRemoteSetting", true);
|
pref("browser.topsites.useRemoteSetting", true);
|
||||||
// Fetch sponsored Top Sites from Mozilla Tiles Service (Contile)
|
// Fetch sponsored Top Sites from Mozilla Tiles Service (Contile)
|
||||||
|
|
@ -28,9 +28,8 @@ index 391bc93e..a7d93085 100644
|
||||||
|
|
||||||
// Mozilla Ad Routing Service (MARS) unified ads service
|
// Mozilla Ad Routing Service (MARS) unified ads service
|
||||||
pref("browser.newtabpage.activity-stream.unifiedAds.tiles.enabled", false);
|
pref("browser.newtabpage.activity-stream.unifiedAds.tiles.enabled", false);
|
||||||
pref("browser.newtabpage.activity-stream.unifiedAds.spocs.enabled", false);
|
@@ -1738,12 +1738,12 @@ pref("browser.newtabpage.activity-stream.unifiedAds.spocs.enabled", false);
|
||||||
-pref("browser.newtabpage.activity-stream.unifiedAds.endpoint", "https://ads.mozilla.org/");
|
pref("browser.newtabpage.activity-stream.unifiedAds.endpoint", "https://ads.mozilla.org/");
|
||||||
+pref("browser.newtabpage.activity-stream.unifiedAds.endpoint", "");
|
|
||||||
|
|
||||||
// Weather widget for newtab
|
// Weather widget for newtab
|
||||||
-pref("browser.newtabpage.activity-stream.showWeather", true);
|
-pref("browser.newtabpage.activity-stream.showWeather", true);
|
||||||
|
|
@ -38,3 +37,9 @@ index 391bc93e..a7d93085 100644
|
||||||
pref("browser.newtabpage.activity-stream.weather.query", "");
|
pref("browser.newtabpage.activity-stream.weather.query", "");
|
||||||
pref("browser.newtabpage.activity-stream.weather.display", "simple");
|
pref("browser.newtabpage.activity-stream.weather.display", "simple");
|
||||||
|
|
||||||
|
// enable location search for newtab weather widget
|
||||||
|
-pref("browser.newtabpage.activity-stream.weather.locationSearchEnabled", true);
|
||||||
|
+pref("browser.newtabpage.activity-stream.weather.locationSearchEnabled", false);
|
||||||
|
|
||||||
|
// List of regions that get weather by default.
|
||||||
|
pref("browser.newtabpage.activity-stream.discoverystream.region-weather-config", "US,CA");
|
||||||
|
|
|
||||||
|
|
@ -19,47 +19,8 @@ with is="" and support-page="..."
|
||||||
|
|
||||||
Cheers!
|
Cheers!
|
||||||
|
|
||||||
diff --git a/browser/components/preferences/privacy.inc.xhtml b/browser/components/preferences/privacy.inc.xhtml
|
diff --git a/browser/components/preferences/privacy.inc.xhtml b/browser/components/preferences/privacy.inc.xhtml_
|
||||||
index a9e8501a..02328371 100644
|
index 77ea8f5d..62c3ce8e 100644
|
||||||
--- a/browser/components/preferences/privacy.inc.xhtml
|
|
||||||
+++ b/browser/components/preferences/privacy.inc.xhtml
|
|
||||||
@@ -21,13 +21,13 @@
|
|
||||||
<hbox align="start">
|
|
||||||
<image id="trackingProtectionShield"/>
|
|
||||||
<description class="description-with-side-element" flex="1">
|
|
||||||
- <html:span id="contentBlockingDescription" data-l10n-id="content-blocking-section-top-level-description"></html:span>
|
|
||||||
- <html:a is="moz-support-link"
|
|
||||||
- id="contentBlockingLearnMore"
|
|
||||||
- class="learnMore"
|
|
||||||
- data-l10n-id="content-blocking-learn-more"
|
|
||||||
- support-page="enhanced-tracking-protection"
|
|
||||||
- />
|
|
||||||
+ <html:span id="contentBlockingDescription" data-l10n-id="content-blocking-section-top-level-description"></html:span>
|
|
||||||
+ <html:a id="contentBlockingLearnMore"
|
|
||||||
+ class="learnMore"
|
|
||||||
+ data-l10n-id="content-blocking-learn-more"
|
|
||||||
+ href="https://trisquel.info/en/wiki/abrowser-help"
|
|
||||||
+ target="_blank"
|
|
||||||
+ />
|
|
||||||
</description>
|
|
||||||
<button id="trackingProtectionExceptions"
|
|
||||||
is="highlightable-button"
|
|
||||||
#@@ -389,9 +386,10 @@
|
|
||||||
# class="tail-with-learn-more"
|
|
||||||
# preference="privacy.donottrackheader.enabled"
|
|
||||||
# data-l10n-id="do-not-track-description2" />
|
|
||||||
#- <html:a is="moz-support-link"
|
|
||||||
#- id="doNotTrackLearnMoreLink"
|
|
||||||
#- support-page="how-do-i-turn-do-not-track-feature" />
|
|
||||||
#+ <html:a id="doNotTrackLearnMoreLink"
|
|
||||||
#+ href="https://trisquel.info/en/wiki/abrowser-help"
|
|
||||||
#+ data-l10n-id="do-not-track-learn-more"
|
|
||||||
#+ target="_blank"/>
|
|
||||||
# </hbox>
|
|
||||||
# </vbox>
|
|
||||||
# </groupbox>
|
|
||||||
diff --git a/browser/components/preferences/privacy.inc.xhtml b/browser/components/preferences/privacy.inc.xhtml
|
|
||||||
index 205c0e01..029b9925 100644
|
|
||||||
--- a/browser/components/preferences/privacy.inc.xhtml
|
--- a/browser/components/preferences/privacy.inc.xhtml
|
||||||
+++ b/browser/components/preferences/privacy.inc.xhtml
|
+++ b/browser/components/preferences/privacy.inc.xhtml
|
||||||
@@ -372,10 +372,7 @@
|
@@ -372,10 +372,7 @@
|
||||||
|
|
@ -74,3 +35,19 @@ index 205c0e01..029b9925 100644
|
||||||
</hbox>
|
</hbox>
|
||||||
</vbox>
|
</vbox>
|
||||||
</groupbox>
|
</groupbox>
|
||||||
|
@@ -388,11 +385,10 @@
|
||||||
|
<vbox flex="1">
|
||||||
|
<description class="description-with-side-element description-deemphasized" flex="1">
|
||||||
|
<html:span id="totalSiteDataSize"></html:span>
|
||||||
|
- <html:a is="moz-support-link"
|
||||||
|
- id="siteDataLearnMoreLink"
|
||||||
|
- data-l10n-id="sitedata-learn-more"
|
||||||
|
- support-page="storage-permissions"
|
||||||
|
- />
|
||||||
|
+ <html:a id="doNotTrackLearnMoreLink"
|
||||||
|
+ href="https://trisquel.info/en/wiki/abrowser-help"
|
||||||
|
+ data-l10n-id="do-not-track-learn-more"
|
||||||
|
+ target="_blank"/>
|
||||||
|
</description>
|
||||||
|
<hbox flex="1" id="deleteOnCloseNote" class="info-box-container smaller-font-size">
|
||||||
|
<hbox class="info-icon-container">
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue