Skip to content
Snippets Groups Projects
Commit 80b64cc0 authored by Luis Guzmán's avatar Luis Guzmán
Browse files

firefox: update helper and patch set for v115.

parent 4b8b610d
No related branches found
No related tags found
1 merge request!1127firefox: update helper and patch set for v115.
Pipeline #1028 passed
...@@ -29,8 +29,8 @@ diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser ...@@ -29,8 +29,8 @@ diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser
index 1b29e8d..6f7566c 100644 index 1b29e8d..6f7566c 100644
--- a/browser/locales/en-US/browser/preferences/preferences.ftl --- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl +++ b/browser/locales/en-US/browser/preferences/preferences.ftl
@@ -714,16 +714,6 @@ sync-signedout-account-signin2 = @@ -838,17 +838,7 @@ sync-signedout-account-signin3 =
.label = Sign in to { -sync-brand-short-name } .label = Sign in to sync…
.accesskey = i .accesskey = i
-# This message contains two links and two icon images. -# This message contains two links and two icon images.
...@@ -43,9 +43,11 @@ index 1b29e8d..6f7566c 100644 ...@@ -43,9 +43,11 @@ index 1b29e8d..6f7566c 100644
-# to your language, but should not be changed or translated. -# to your language, but should not be changed or translated.
-sync-mobile-promo = Download Firefox for <img data-l10n-name="android-icon"/> <a data-l10n-name="android-link">Android</a> or <img data-l10n-name="ios-icon"/> <a data-l10n-name="ios-link">iOS</a> to sync with your mobile device. -sync-mobile-promo = Download Firefox for <img data-l10n-name="android-icon"/> <a data-l10n-name="android-link">Android</a> or <img data-l10n-name="ios-icon"/> <a data-l10n-name="ios-link">iOS</a> to sync with your mobile device.
- -
## Sync Account - Signed in -## Firefox account - Signed in
+## Sync Account - Signed in
sync-profile-picture = sync-profile-picture =
.tooltiptext = Change profile picture
diff --git a/browser/components/protections/content/vpn-card.mjs b/browser/components/protections/content/vpn-card.mjs diff --git a/browser/components/protections/content/vpn-card.mjs b/browser/components/protections/content/vpn-card.mjs
index 2417f1a641..698c48ccc3 100644 index 2417f1a641..698c48ccc3 100644
--- a/browser/components/protections/content/vpn-card.mjs --- a/browser/components/protections/content/vpn-card.mjs
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=101 VERSION=102
EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main' EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main'
REPOKEY=9BDB3D89CE49EC21 REPOKEY=9BDB3D89CE49EC21
...@@ -34,7 +34,7 @@ sed '/async download.*/areturn;' -i services/settings/RemoteSettingsClient.sys.m ...@@ -34,7 +34,7 @@ sed '/async download.*/areturn;' -i services/settings/RemoteSettingsClient.sys.m
# Disable activity-stream antifeatures. # Disable activity-stream antifeatures.
# These are not condensed into a single sed script to make it fail on individual commands that didn't change the source # These are not condensed into a single sed script to make it fail on individual commands that didn't change the source
ActivityStream=browser/components/newtab/lib/ActivityStream.jsm ActivityStream=browser/components/newtab/lib/ActivityStream.jsm
sed '/^const DEFAULT_SITES/,/^])\;/c const DEFAULT_SITES = new Map\([[""]]\);' -i browser/components/newtab/lib/DefaultSites.jsm sed '/^const DEFAULT_SITES/,/^])\;/c const DEFAULT_SITES = new Map\([[""]]\);' -i browser/components/newtab/lib/DefaultSites.sys.mjs
sed '/"showSponsored"/,/value/s/value: true/value: false/' -i $ActivityStream sed '/"showSponsored"/,/value/s/value: true/value: false/' -i $ActivityStream
sed '/"telemetry"/,/value/s/value: true/value: false/' -i $ActivityStream sed '/"telemetry"/,/value/s/value: true/value: false/' -i $ActivityStream
sed '/"section.highlights.includePocket"/,/value/s/value: true/value: false/' -i $ActivityStream sed '/"section.highlights.includePocket"/,/value/s/value: true/value: false/' -i $ActivityStream
...@@ -44,7 +44,7 @@ sed '/stories_endpoint/s/getpocket.cdn.mozilla.net/127.0.0.1/' -i $ActivityStrea ...@@ -44,7 +44,7 @@ sed '/stories_endpoint/s/getpocket.cdn.mozilla.net/127.0.0.1/' -i $ActivityStrea
sed '/stories_referrer/s/http.*/",/' -i $ActivityStream sed '/stories_referrer/s/http.*/",/' -i $ActivityStream
sed '/topics_endpoint/s/getpocket.cdn.mozilla.net/127.0.0.1/' -i $ActivityStream sed '/topics_endpoint/s/getpocket.cdn.mozilla.net/127.0.0.1/' -i $ActivityStream
sed 's/preffedRegions.includes.geo. .. ..locales .. locales.includes.locale./false/' -i $ActivityStream sed 's/preffedRegions.includes.geo. .. ..locales .. locales.includes.locale./false/' -i $ActivityStream
sed 's/.Ubuntu., //' -i browser/components/newtab/css/activity-stream*.css sed 's/Ubuntu, //' -i browser/components/newtab/css/activity-stream*.css
echo "#header-asrouter-container{display: none!important;}" >> browser/components/newtab/css/activity-stream-linux.css echo "#header-asrouter-container{display: none!important;}" >> browser/components/newtab/css/activity-stream-linux.css
#Disable «Sponsored tiles on the New Tab page» - firefox 92+94 #Disable «Sponsored tiles on the New Tab page» - firefox 92+94
sed '/"showSponsoredTopSites"/,/value/s/value: true/value: false/' -i $ActivityStream sed '/"showSponsoredTopSites"/,/value/s/value: true/value: false/' -i $ActivityStream
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment