| |
@@ -1,11 +1,11 @@
|
| |
- From d8ea43891548f1e2a205cf73bb5b39f916a0ee8d Mon Sep 17 00:00:00 2001
|
| |
+ From 9ca2b97670c2505885f920703a7cc111c9ea6712 Mon Sep 17 00:00:00 2001
|
| |
From: grizzlyuser <grizzlyuser@protonmail.com>
|
| |
Date: Sat, 12 Mar 2022 17:14:25 +0100
|
| |
- Subject: [PATCH] FSDG: Replace upstream default bookmarks
|
| |
+ Subject: [PATCH 1/6] FSDG: Replace upstream default bookmarks
|
| |
|
| |
---
|
| |
- browser/base/content/default-bookmarks.html | 50 +++++++++------------
|
| |
- 1 file changed, 21 insertions(+), 29 deletions(-)
|
| |
+ browser/base/content/default-bookmarks.html | 60 ++++++++-------------
|
| |
+ 1 file changed, 21 insertions(+), 39 deletions(-)
|
| |
|
| |
diff --git a/browser/base/content/default-bookmarks.html b/browser/base/content/default-bookmarks.html
|
| |
index c42e81ac23..e2e643bcf2 100644
|
| |
@@ -90,36 +90,35 @@
|
| |
</body>
|
| |
</html>
|
| |
--
|
| |
- 2.35.1
|
| |
+ 2.45.1
|
| |
|
| |
- From f4475bc77e63f16562aa8360233140522d72d8d4 Mon Sep 17 00:00:00 2001
|
| |
+
|
| |
+ From 10d35b0bf8c6509056898f7882f460bf9039ab75 Mon Sep 17 00:00:00 2001
|
| |
From: grizzlyuser <grizzlyuser@protonmail.com>
|
| |
Date: Sat, 7 May 2022 21:46:48 +0200
|
| |
- Subject: [PATCH] Remove 'More from Mozilla' section in Preferences
|
| |
+ Subject: [PATCH 2/6] Remove 'More from Mozilla' section in Preferences
|
| |
|
| |
Currently it contains functionality to provide links to nonfree software
|
| |
like Firefox Mobile, which is not compatible with the FSDG for the same
|
| |
reasons as desktop Firefox.
|
| |
---
|
| |
browser/app/profile/firefox.js | 2 +-
|
| |
- .../static/browser_all_files_referenced.js | 12 -------
|
| |
- browser/components/preferences/jar.mn | 4 ---
|
| |
- .../more-from-mozilla-qr-code-advanced.svg | 4 ---
|
| |
+ .../static/browser_all_files_referenced.js | 9 ------
|
| |
+ browser/components/preferences/jar.mn | 3 --
|
| |
.../more-from-mozilla-qr-code-simple-cn.svg | 4 ---
|
| |
.../more-from-mozilla-qr-code-simple.svg | 4 ---
|
| |
- .../components/preferences/moreFromMozilla.js | 33 +------------------
|
| |
- browser/components/preferences/preferences.js | 9 -----
|
| |
- .../components/preferences/preferences.xhtml | 12 -------
|
| |
- 9 files changed, 2 insertions(+), 82 deletions(-)
|
| |
- delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-advanced.svg
|
| |
+ .../components/preferences/moreFromMozilla.js | 30 -------------------
|
| |
+ browser/components/preferences/preferences.js | 8 -----
|
| |
+ .../components/preferences/preferences.xhtml | 12 --------
|
| |
+ 8 files changed, 1 insertion(+), 71 deletions(-)
|
| |
delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg
|
| |
delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-simple.svg
|
| |
|
| |
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
|
| |
- index 76b495ea6c..d0c2b98b11 100644
|
| |
+ index 6203966405..85806a9f6e 100644
|
| |
--- a/browser/app/profile/firefox.js
|
| |
+++ b/browser/app/profile/firefox.js
|
| |
- @@ -1011,7 +1011,7 @@ pref("browser.preferences.experimental", true);
|
| |
+ @@ -1236,7 +1236,7 @@ pref("browser.preferences.experimental", true);
|
| |
#else
|
| |
pref("browser.preferences.experimental", false);
|
| |
#endif
|
| |
@@ -129,10 +128,10 @@
|
| |
pref("browser.preferences.defaultPerformanceSettings.enabled", true);
|
| |
|
| |
diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js
|
| |
- index df8a1997a7..40696ea097 100644
|
| |
+ index d73c3fe8de..b47bb4c39f 100644
|
| |
--- a/browser/base/content/test/static/browser_all_files_referenced.js
|
| |
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
|
| |
- @@ -147,15 +147,6 @@ var whitelist = [
|
| |
+ @@ -144,15 +144,6 @@ var allowlist = [
|
| |
// extensions/pref/autoconfig/src/nsReadConfig.cpp
|
| |
{ file: "resource://gre/defaults/autoconfig/prefcalls.js" },
|
| |
|
| |
@@ -227,10 +226,10 @@
|
| |
id: "mozilla-monitor",
|
| |
title_string_id: "more-from-moz-mozilla-monitor-title",
|
| |
diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
|
| |
- index 115a67c962..3f9b72b021 100644
|
| |
+ index 0cd498fd96..89d2abf0fe 100644
|
| |
--- a/browser/components/preferences/preferences.js
|
| |
+++ b/browser/components/preferences/preferences.js
|
| |
- @@ -10,7 +10,6 @@
|
| |
+ @@ -11,7 +11,6 @@
|
| |
/* import-globals-from privacy.js */
|
| |
/* import-globals-from sync.js */
|
| |
/* import-globals-from experimental.js */
|
| |
@@ -238,7 +237,7 @@
|
| |
/* import-globals-from findInPage.js */
|
| |
/* import-globals-from /browser/base/content/utilityOverlay.js */
|
| |
/* import-globals-from /toolkit/content/preferencesBindings.js */
|
| |
- @@ -227,13 +226,6 @@ function init_all() {
|
| |
+ @@ -218,13 +217,6 @@ function init_all() {
|
| |
register_module("paneExperimental", gExperimentalPane);
|
| |
}
|
| |
|
| |
@@ -253,7 +252,7 @@
|
| |
// registered and inititalized since many tests wait for the
|
| |
// "sync-pane-loaded" observer notification before starting the test.
|
| |
diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
|
| |
- index eee227822a..7ebf547d2c 100644
|
| |
+ index 64062f1f77..dde3dd1259 100644
|
| |
--- a/browser/components/preferences/preferences.xhtml
|
| |
+++ b/browser/components/preferences/preferences.xhtml
|
| |
@@ -47,7 +47,6 @@
|
| |
@@ -264,7 +263,7 @@
|
| |
<link rel="localization" href="browser/preferences/preferences.ftl"/>
|
| |
<link rel="localization" href="toolkit/branding/accounts.ftl"/>
|
| |
<link rel="localization" href="toolkit/branding/brandings.ftl"/>
|
| |
- @@ -168,16 +167,6 @@
|
| |
+ @@ -170,16 +169,6 @@
|
| |
<image class="category-icon"/>
|
| |
<label class="category-name" flex="1" data-l10n-id="pane-experimental-title"></label>
|
| |
</richlistitem>
|
| |
@@ -281,7 +280,7 @@
|
| |
|
| |
<!-- The following <richlistitem> elements are hidden from the list of items via the hidden-category class.
|
| |
The intent is that they act as sub-pages, accessible from the UI of one of the main pages, but are
|
| |
- @@ -247,7 +236,6 @@
|
| |
+ @@ -249,7 +238,6 @@
|
| |
#include translations.inc.xhtml
|
| |
#include sync.inc.xhtml
|
| |
#include experimental.inc.xhtml
|
| |
@@ -290,13 +289,13 @@
|
| |
</vbox>
|
| |
</vbox>
|
| |
--
|
| |
- 2.36.0
|
| |
+ 2.45.1
|
| |
|
| |
|
| |
- From 66dec07e773e35b82aa42120441dea0fb185986d Mon Sep 17 00:00:00 2001
|
| |
+ From 7bfcf6fdd1fe2c37e40ac526974a10b2388ae662 Mon Sep 17 00:00:00 2001
|
| |
From: grizzlyuser <grizzlyuser@protonmail.com>
|
| |
Date: Sat, 7 May 2022 21:51:06 +0200
|
| |
- Subject: [PATCH] Remove promos of Firefox Focus and Klar from Private
|
| |
+ Subject: [PATCH 3/6] Remove promos of Firefox Focus and Klar from Private
|
| |
Browsing
|
| |
|
| |
Please correct me if I'm wrong, but these are not compatible with FSDG
|
| |
@@ -304,19 +303,19 @@
|
| |
---
|
| |
browser/app/profile/firefox.js | 2 +-
|
| |
.../static/browser_all_files_referenced.js | 2 -
|
| |
- .../newtab/lib/OnboardingMessageProvider.jsm | 215 ------------------
|
| |
- .../newtab/lib/PanelTestProvider.sys.mjs | 84 -------
|
| |
- .../content/assets/focus-qr-code.svg | 114 ----------
|
| |
- .../content/assets/klar-qr-code.svg | 114 ----------
|
| |
- 6 files changed, 1 insertion(+), 530 deletions(-)
|
| |
+ .../modules/OnboardingMessageProvider.sys.mjs | 309 ------------------
|
| |
+ .../modules/PanelTestProvider.sys.mjs | 79 -----
|
| |
+ .../content/assets/focus-qr-code.svg | 114 -------
|
| |
+ .../content/assets/klar-qr-code.svg | 114 -------
|
| |
+ 6 files changed, 1 insertion(+), 619 deletions(-)
|
| |
delete mode 100644 browser/components/privatebrowsing/content/assets/focus-qr-code.svg
|
| |
delete mode 100644 browser/components/privatebrowsing/content/assets/klar-qr-code.svg
|
| |
|
| |
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
|
| |
- index d0eeab95fa..f69cab44a1 100644
|
| |
+ index 85806a9f6e..fbf35c59c6 100644
|
| |
--- a/browser/app/profile/firefox.js
|
| |
+++ b/browser/app/profile/firefox.js
|
| |
- @@ -2013,7 +2013,7 @@ pref("browser.contentblocking.report.vpn_regions", "as,at,be,ca,ch,de,es,fi,fr,g
|
| |
+ @@ -2137,7 +2137,7 @@ pref("browser.contentblocking.report.vpn_regions", "ca,my,nz,sg,gb,gg,im,io,je,u
|
| |
pref("browser.promo.focus.disallowed_regions", "cn");
|
| |
|
| |
// Default to enabling focus promos to be shown where allowed.
|
| |
@@ -326,7 +325,7 @@
|
| |
// Default to enabling pin promos to be shown where allowed.
|
| |
pref("browser.promo.pin.enabled", true);
|
| |
diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js
|
| |
- index df8a1997a7..d3cafd9c7f 100644
|
| |
+ index b47bb4c39f..79ca6d9f44 100644
|
| |
--- a/browser/base/content/test/static/browser_all_files_referenced.js
|
| |
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
|
| |
@@ -35,8 +35,6 @@ var gExceptionPaths = [
|
| |
@@ -339,10 +338,10 @@
|
| |
// toolkit/components/pdfjs/content/build/pdf.js
|
| |
"resource://pdf.js/web/images/",
|
| |
diff --git a/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs b/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs
|
| |
- index 49a76defeb..38407b8e4b 100644
|
| |
+ index 3cfbbb3f34..6c01d63aea 100644
|
| |
--- a/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs
|
| |
+++ b/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs
|
| |
- @@ -505,315 +505,6 @@ const BASE_MESSAGES = () => [
|
| |
+ @@ -496,315 +496,6 @@ const BASE_MESSAGES = () => [
|
| |
],
|
| |
},
|
| |
},
|
| |
@@ -659,10 +658,10 @@
|
| |
id: "PB_NEWTAB_PIN_PROMO",
|
| |
template: "pb_newtab",
|
| |
diff --git a/browser/components/asrouter/modules/PanelTestProvider.sys.mjs b/browser/components/asrouter/modules/PanelTestProvider.sys.mjs
|
| |
- index b5ff59290a..eb5fc60451 100644
|
| |
+ index 5180e2e6a2..13a871b856 100644
|
| |
--- a/browser/components/asrouter/modules/PanelTestProvider.sys.mjs
|
| |
+++ b/browser/components/asrouter/modules/PanelTestProvider.sys.mjs
|
| |
- @@ -367,85 +367,6 @@ const MESSAGES = () => [
|
| |
+ @@ -236,85 +236,6 @@ const MESSAGES = () => [
|
| |
frequency: { lifetime: 3 },
|
| |
trigger: { id: "defaultBrowserCheck" },
|
| |
},
|
| |
@@ -989,30 +988,29 @@
|
| |
-</defs>
|
| |
-</svg>
|
| |
--
|
| |
- 2.36.0
|
| |
+ 2.45.1
|
| |
+
|
| |
|
| |
- From 842d945be96cddf4192fed890066f96bc9894a83 Mon Sep 17 00:00:00 2001
|
| |
+ From 11196e21c50d8fb32461157d130abb4bbf7eb851 Mon Sep 17 00:00:00 2001
|
| |
From: grizzlyuser <grizzlyuser@protonmail.com>
|
| |
Date: Tue, 17 Jan 2023 21:59:51 +0100
|
| |
- Subject: [PATCH] FSDG: Remove 'Extensions for developers' menu item
|
| |
-
|
| |
- Main menu -> 'More tools' -> 'Extensions for developers' opens
|
| |
- addons.mozilla.org (AMO), a third-party repository, not compatible
|
| |
- with the FSDG, because it is not committed to only including free
|
| |
- software, see [1].
|
| |
+ Subject: [PATCH 4/6] FSDG: Remove 'Extensions for developers' menu item Main
|
| |
+ menu -> 'More tools' -> 'Extensions for developers' opens addons.mozilla.org
|
| |
+ (AMO), a third-party repository, not compatible with the FSDG, because it is
|
| |
+ not committed to only including free software, see [1].
|
| |
|
| |
[1] https://labs.parabola.nu/issues/2409#note-4
|
| |
---
|
| |
- browser/components/asrouter/modules/CFRPageActions.sys.mjs | 2 +-
|
| |
- devtools/client/framework/devtools-browser.js | 3 ++-
|
| |
- devtools/client/menus.js | 2 +-
|
| |
+ browser/components/asrouter/modules/CFRPageActions.sys.mjs | 2 +-
|
| |
+ devtools/client/framework/devtools-browser.js | 3 ++-
|
| |
+ devtools/client/menus.js | 2 +-
|
| |
3 files changed, 4 insertions(+), 3 deletions(-)
|
| |
|
| |
diff --git a/browser/components/asrouter/modules/CFRPageActions.sys.mjs b/browser/components/asrouter/modules/CFRPageActions.sys.mjs
|
| |
- index 2ca59d73e3..6e06ee7c93 100644
|
| |
+ index 392173f754..f1f532acb3 100644
|
| |
--- a/browser/components/asrouter/modules/CFRPageActions.sys.mjs
|
| |
+++ b/browser/components/asrouter/modules/CFRPageActions.sys.mjs
|
| |
- @@ -38,7 +38,7 @@ const SUMO_BASE_URL = Services.urlFormatter.formatURLPref(
|
| |
+ @@ -41,7 +41,7 @@ const SUMO_BASE_URL = Services.urlFormatter.formatURLPref(
|
| |
"app.support.baseURL"
|
| |
);
|
| |
const ADDONS_API_URL =
|
| |
@@ -1022,10 +1020,10 @@
|
| |
const DELAY_BEFORE_EXPAND_MS = 1000;
|
| |
const CATEGORY_ICONS = {
|
| |
diff --git a/devtools/client/framework/devtools-browser.js b/devtools/client/framework/devtools-browser.js
|
| |
- index 8357df95d0..a9eb87c232 100644
|
| |
+ index 2cfbc09331..ac4cd7bad2 100644
|
| |
--- a/devtools/client/framework/devtools-browser.js
|
| |
+++ b/devtools/client/framework/devtools-browser.js
|
| |
- @@ -155,8 +155,9 @@ var gDevToolsBrowser = (exports.gDevToolsBrowser = {
|
| |
+ @@ -131,8 +131,9 @@ var gDevToolsBrowser = (exports.gDevToolsBrowser = {
|
| |
toggleMenuItem("menu_browserConsole", false);
|
| |
toggleMenuItem("menu_responsiveUI", false);
|
| |
toggleMenuItem("menu_eyedropper", false);
|
| |
@@ -1037,10 +1035,10 @@
|
| |
|
| |
/**
|
| |
diff --git a/devtools/client/menus.js b/devtools/client/menus.js
|
| |
- index b47e1c4a3f..fd62bfd3df 100644
|
| |
+ index e75115c220..0abeb4d830 100644
|
| |
--- a/devtools/client/menus.js
|
| |
+++ b/devtools/client/menus.js
|
| |
- @@ -189,7 +189,7 @@ exports.menuitems = [
|
| |
+ @@ -181,7 +181,7 @@ exports.menuitems = [
|
| |
appMenuL10nId: "appmenu-developer-tools-extensions",
|
| |
oncommand() {
|
| |
openDocLink(
|
| |
@@ -1050,12 +1048,13 @@
|
| |
},
|
| |
},
|
| |
--
|
| |
- 2.39.0
|
| |
+ 2.45.1
|
| |
+
|
| |
|
| |
- From a985a80d5df1226f4d7f84a72dd6c03b51fc68e4 Mon Sep 17 00:00:00 2001
|
| |
+ From ecd3f96cb4df329a9cc84dede9a5ae6632ab401d Mon Sep 17 00:00:00 2001
|
| |
From: grizzlyuser <grizzlyuser@protonmail.com>
|
| |
Date: Sun, 12 Mar 2023 21:57:14 +0100
|
| |
- Subject: [PATCH] FSDG: Change DuckDuckGo URL to DuckDuckGo HTML URL
|
| |
+ Subject: [PATCH 5/6] FSDG: Change DuckDuckGo URL to DuckDuckGo HTML URL
|
| |
|
| |
Some of JavaScript files from the regular DDG URL lack license info, and
|
| |
I couldn't find their freely licensed sources, so they can be considered
|
| |
@@ -1112,26 +1111,27 @@
|
| |
"suggest_url_get_params": "q={searchTerms}&type=list"
|
| |
}
|
| |
--
|
| |
- 2.39.2
|
| |
+ 2.45.1
|
| |
|
| |
- From a985a80d5df1226f4d7f84a72dd6c03b51fc86e4 Mon Sep 17 00:00:00 2001
|
| |
+
|
| |
+ From e3a7694385c0622d3851d0a5cd5d4dbee979f562 Mon Sep 17 00:00:00 2001
|
| |
From: various_authors <various_authors@parabola.nu>
|
| |
- Date: Mon, Sep 17 00:00:00 2001 +0100
|
| |
- Subject: [PATCH] FSDG: Various patches
|
| |
+ Date: Mon, 17 Sep 2001 00:00:00 +0100
|
| |
+ Subject: [PATCH 6/6] FSDG: Various patches
|
| |
|
| |
I'm too lazy to find the history for each, just making the whole patch
|
| |
set compatible with 'git am' and easier to manage. If needed, it can be
|
| |
found using git.
|
| |
---
|
| |
- browser/app/permissions | 3 ---
|
| |
- browser/components/preferences/sync.inc.xhtml | 16 ----------------
|
| |
- .../protections/content/protections.ftl | 2 +-
|
| |
- .../protections/content/protections.html | 10 ----------
|
| |
- .../components/protections/content/vpn-card.mjs | 16 ----------------
|
| |
- .../en-US/browser/preferences/preferences.ftl | 10 ----------
|
| |
- .../locales/en-US/toolkit/about/aboutAddons.ftl | 10 ++++++----
|
| |
- .../locales/en-US/toolkit/branding/brandings.ftl | 14 +++++++-------
|
| |
- 8 files changed, 14 insertions(+), 67 deletions(-)
|
| |
+ browser/app/permissions | 3 ---
|
| |
+ browser/components/preferences/sync.inc.xhtml | 18 ------------------
|
| |
+ .../protections/content/protections.ftl | 2 +-
|
| |
+ .../protections/content/protections.html | 10 ----------
|
| |
+ .../protections/content/vpn-card.mjs | 16 ----------------
|
| |
+ .../en-US/browser/preferences/preferences.ftl | 10 ----------
|
| |
+ .../en-US/toolkit/about/aboutAddons.ftl | 10 ++++++----
|
| |
+ .../en-US/toolkit/branding/brandings.ftl | 14 +++++++-------
|
| |
+ 8 files changed, 14 insertions(+), 69 deletions(-)
|
| |
|
| |
diff --git a/browser/app/permissions b/browser/app/permissions
|
| |
index 1c72a96de8..052a6a5c83 100644
|
| |
@@ -1148,15 +1148,16 @@
|
| |
origin remote-troubleshooting 1 https://support.mozilla.org
|
| |
|
| |
diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml
|
| |
- index 7d37d26..4ebbc06 100644
|
| |
+ index 492491a369..0c8c462a1d 100644
|
| |
--- a/browser/components/preferences/sync.inc.xhtml
|
| |
+++ b/browser/components/preferences/sync.inc.xhtml
|
| |
- @@ -35,22 +35,6 @@
|
| |
+ @@ -35,24 +35,6 @@
|
| |
</hbox>
|
| |
</vbox>
|
| |
</hbox>
|
| |
- <label class="fxaMobilePromo" data-l10n-id="sync-mobile-promo">
|
| |
- <html:img
|
| |
+ - role="none"
|
| |
- src="chrome://browser/skin/logo-android.svg"
|
| |
- data-l10n-name="android-icon"
|
| |
- class="androidIcon"/>
|
| |
@@ -1164,6 +1165,7 @@
|
| |
- data-l10n-name="android-link"
|
| |
- class="fxaMobilePromo-android text-link" target="_blank"/>
|
| |
- <html:img
|
| |
+ - role="none"
|
| |
- src="chrome://browser/skin/logo-ios.svg"
|
| |
- data-l10n-name="ios-icon"
|
| |
- class="iOSIcon"/>
|
| |
@@ -1174,117 +1176,8 @@
|
| |
</groupbox>
|
| |
|
| |
<vbox id="hasFxaAccount">
|
| |
- diff --git a/toolkit/locales/en-US/toolkit/branding/brandings.ftl b/toolkit/locales/en-US/toolkit/branding/brandings.ftl
|
| |
- index 504598d05e..075f9f60cb 100644
|
| |
- --- a/toolkit/locales/en-US/toolkit/branding/brandings.ftl
|
| |
- +++ b/toolkit/locales/en-US/toolkit/branding/brandings.ftl
|
| |
- @@ -15,16 +15,16 @@
|
| |
- ## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark
|
| |
-
|
| |
- -facebook-container-brand-name = Facebook Container
|
| |
- --monitor-brand-name = Firefox Monitor
|
| |
- +-monitor-brand-name = Iceweasel Monitor
|
| |
- -monitor-brand-short-name = Monitor
|
| |
- -mozmonitor-brand-name = Mozilla Monitor
|
| |
- -pocket-brand-name = Pocket
|
| |
- --send-brand-name = Firefox Send
|
| |
- --screenshots-brand-name = Firefox Screenshots
|
| |
- +-send-brand-name = Iceweasel Send
|
| |
- +-screenshots-brand-name = Iceweasel Screenshots
|
| |
- -mozilla-vpn-brand-name = Mozilla VPN
|
| |
- --profiler-brand-name = Firefox Profiler
|
| |
- --translations-brand-name = Firefox Translations
|
| |
- --focus-brand-name = Firefox Focus
|
| |
- --relay-brand-name = Firefox Relay
|
| |
- +-profiler-brand-name = Iceweasel Profiler
|
| |
- +-translations-brand-name = Iceweasel Translations
|
| |
- +-focus-brand-name = Iceweasel Focus
|
| |
- +-relay-brand-name = Iceweasel Relay
|
| |
- -relay-brand-short-name = Relay
|
| |
- -fakespot-brand-name = Fakespot
|
| |
-
|
| |
- # Note the name of the website is capitalized.
|
| |
- -fakespot-website-name = Fakespot.com
|
| |
-
|
| |
- # The particle "by" can be localized, "Fakespot" and "Mozilla" should not be localized or transliterated.
|
| |
- -fakespot-brand-full-name = Fakespot by Mozilla
|
| |
-
|
| |
- -# “Suggest” can be localized, “Firefox” must be treated as a brand
|
| |
- +# “Suggest” can be localized, “Iceweasel” must be treated as a brand
|
| |
- # and kept in English.
|
| |
- --firefox-suggest-brand-name = Firefox Suggest
|
| |
- +-Iceweasel-suggest-brand-name = Iceweasel Suggest
|
| |
-
|
| |
- -# ”Home" can be localized, “Firefox” must be treated as a brand
|
| |
- +# ”Home" can be localized, “Iceweasel” must be treated as a brand
|
| |
- # and kept in English.
|
| |
- --firefox-home-brand-name = Firefox Home
|
| |
- +-Iceweasel-home-brand-name = Iceweasel Home
|
| |
-
|
| |
- -# View" can be localized, “Firefox” must be treated as a brand
|
| |
- +# View" can be localized, “Iceweasel” must be treated as a brand
|
| |
- # and kept in English.
|
| |
- --firefoxview-brand-name = Firefox View
|
| |
- +-Iceweaselview-brand-name = Iceweasel View
|
| |
- diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl
|
| |
- index 829c18c5e1..71c75114e9 100644
|
| |
- --- a/browser/locales/en-US/browser/preferences/preferences.ftl
|
| |
- +++ b/browser/locales/en-US/browser/preferences/preferences.ftl
|
| |
- @@ -838,16 +838,6 @@ sync-signedout-account-signin3 =
|
| |
- .label = Sign in to sync…
|
| |
- .accesskey = i
|
| |
-
|
| |
- -# This message contains two links and two icon images.
|
| |
- -# `<img data-l10n-name="android-icon"/>` - Android logo icon
|
| |
- -# `<a data-l10n-name="android-link">` - Link to Android Download
|
| |
- -# `<img data-l10n-name="ios-icon">` - iOS logo icon
|
| |
- -# `<a data-l10n-name="ios-link">` - Link to iOS Download
|
| |
- -#
|
| |
- -# They can be moved within the sentence as needed to adapt
|
| |
- -# 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.
|
| |
- -
|
| |
- ## Firefox account - Signed in
|
| |
-
|
| |
- sync-profile-picture =
|
| |
- diff --git a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
|
| |
- index f4aa0a5..e2978e3 100644
|
| |
- --- a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
|
| |
- +++ b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
|
| |
- @@ -5,7 +5,7 @@
|
| |
- addons-page-title = Add-ons Manager
|
| |
-
|
| |
- search-header =
|
| |
- - .placeholder = Search addons.mozilla.org
|
| |
- + .placeholder = Search Mozarella
|
| |
- .searchbuttonlabel = Search
|
| |
-
|
| |
- ## Variables
|
| |
- @@ -335,7 +335,8 @@ install-theme-button = Install Theme
|
| |
- # The label of the button that appears after installing an add-on. Upon click,
|
| |
- # the detailed add-on view is opened, from where the add-on can be managed.
|
| |
- manage-addon-button = Manage
|
| |
- -find-more-addons = Find more add-ons
|
| |
- +find-more-addons = Popular add-ons are in the Parabola pacman repos.
|
| |
- + For others, you can search here:
|
| |
- find-more-themes = Find more themes
|
| |
-
|
| |
- # This is a label for the button to open the "more options" menu, it is only
|
| |
- @@ -505,9 +505,10 @@ sitepermission-heading = Manage Your Site Permissions
|
| |
- discover-heading = Personalize Your { -brand-short-name }
|
| |
- shortcuts-heading = Manage Extension Shortcuts
|
| |
-
|
| |
- -default-heading-search-label = Find more add-ons
|
| |
- +default-heading-search-label = Popular add-ons are in the Parabola pacman repos.
|
| |
- + For others, you can search here:
|
| |
- addons-heading-search-input =
|
| |
- - .placeholder = Search addons.mozilla.org
|
| |
- + .placeholder = Search Mozarella
|
| |
-
|
| |
- addon-page-options-button =
|
| |
- .title = Tools for all add-ons
|
| |
diff --git a/browser/components/protections/content/protections.ftl b/browser/components/protections/content/protections.ftl
|
| |
- index 5ac8a7b08c..fec81698e3 100644
|
| |
+ index 0f5b96e7ff..9617795e92 100644
|
| |
--- a/browser/components/protections/content/protections.ftl
|
| |
+++ b/browser/components/protections/content/protections.ftl
|
| |
@@ -18,7 +18,7 @@ get-vpn-link = Get { -mozilla-vpn-brand-name }
|
| |
@@ -1318,10 +1211,10 @@
|
| |
</div>
|
| |
<a
|
| |
diff --git a/browser/components/protections/content/vpn-card.mjs b/browser/components/protections/content/vpn-card.mjs
|
| |
- index 2417f1a641..698c48ccc3 100644
|
| |
+ index dd2039db2e..e70583628b 100644
|
| |
--- a/browser/components/protections/content/vpn-card.mjs
|
| |
+++ b/browser/components/protections/content/vpn-card.mjs
|
| |
- @@ -23,22 +23,6 @@ export default class VPNCard {
|
| |
+ @@ -24,22 +24,6 @@ export default class VPNCard {
|
| |
vpnLink.addEventListener("click", () => {
|
| |
this.doc.sendTelemetryEvent("click", "vpn_card_link");
|
| |
});
|
| |
@@ -1344,5 +1237,92 @@
|
| |
|
| |
const vpnBanner = this.doc.querySelector(".vpn-banner");
|
| |
const exitIcon = vpnBanner.querySelector(".exit-icon");
|
| |
- --
|
| |
- 2.39.2
|
| |
+ diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl
|
| |
+ index c25b299ae1..a710fa74af 100644
|
| |
+ --- a/browser/locales/en-US/browser/preferences/preferences.ftl
|
| |
+ +++ b/browser/locales/en-US/browser/preferences/preferences.ftl
|
| |
+ @@ -843,16 +843,6 @@ sync-signedout-account-signin3 =
|
| |
+ .label = Sign in to sync…
|
| |
+ .accesskey = i
|
| |
+
|
| |
+ -# This message contains two links and two icon images.
|
| |
+ -# `<img data-l10n-name="android-icon"/>` - Android logo icon
|
| |
+ -# `<a data-l10n-name="android-link">` - Link to Android Download
|
| |
+ -# `<img data-l10n-name="ios-icon">` - iOS logo icon
|
| |
+ -# `<a data-l10n-name="ios-link">` - Link to iOS Download
|
| |
+ -#
|
| |
+ -# They can be moved within the sentence as needed to adapt
|
| |
+ -# 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.
|
| |
+ -
|
| |
+ ## Firefox account - Signed in
|
| |
+
|
| |
+ sync-profile-picture-with-alt =
|
| |
+ diff --git a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
|
| |
+ index dbdbfd063d..65942db1eb 100644
|
| |
+ --- a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
|
| |
+ +++ b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
|
| |
+ @@ -5,7 +5,7 @@
|
| |
+ addons-page-title = Add-ons Manager
|
| |
+
|
| |
+ search-header =
|
| |
+ - .placeholder = Search addons.mozilla.org
|
| |
+ + .placeholder = Search Mozarella
|
| |
+ .searchbuttonlabel = Search
|
| |
+
|
| |
+ ## Variables
|
| |
+ @@ -344,7 +344,8 @@ install-theme-button = Install Theme
|
| |
+ # The label of the button that appears after installing an add-on. Upon click,
|
| |
+ # the detailed add-on view is opened, from where the add-on can be managed.
|
| |
+ manage-addon-button = Manage
|
| |
+ -find-more-addons = Find more add-ons
|
| |
+ +find-more-addons = Popular add-ons are in the Parabola pacman repos.
|
| |
+ + For others, you can search here:
|
| |
+ find-more-themes = Find more themes
|
| |
+
|
| |
+ # This is a label for the button to open the "more options" menu, it is only
|
| |
+ @@ -516,9 +517,10 @@ sitepermission-heading = Manage Your Site Permissions
|
| |
+ discover-heading = Personalize Your { -brand-short-name }
|
| |
+ shortcuts-heading = Manage Extension Shortcuts
|
| |
+
|
| |
+ -default-heading-search-label = Find more add-ons
|
| |
+ +default-heading-search-label = Popular add-ons are in the Parabola pacman repos.
|
| |
+ + For others, you can search here:
|
| |
+ addons-heading-search-input =
|
| |
+ - .placeholder = Search addons.mozilla.org
|
| |
+ + .placeholder = Search Mozarella
|
| |
+
|
| |
+ addon-page-options-button =
|
| |
+ .title = Tools for all add-ons
|
| |
+ diff --git a/toolkit/locales/en-US/toolkit/branding/brandings.ftl b/toolkit/locales/en-US/toolkit/branding/brandings.ftl
|
| |
+ index cc95fbc3b8..018b2e1bce 100644
|
| |
+ --- a/toolkit/locales/en-US/toolkit/branding/brandings.ftl
|
| |
+ +++ b/toolkit/locales/en-US/toolkit/branding/brandings.ftl
|
| |
+ @@ -15,17 +15,17 @@
|
| |
+ ## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark
|
| |
+
|
| |
+ -facebook-container-brand-name = Facebook Container
|
| |
+ --monitor-brand-name = Firefox Monitor
|
| |
+ +-monitor-brand-name = Iceweasel Monitor
|
| |
+ -monitor-brand-short-name = Monitor
|
| |
+ -mozmonitor-brand-name = Mozilla Monitor
|
| |
+ -pocket-brand-name = Pocket
|
| |
+ --send-brand-name = Firefox Send
|
| |
+ --screenshots-brand-name = Firefox Screenshots
|
| |
+ +-send-brand-name = Iceweasel Send
|
| |
+ +-screenshots-brand-name = Iceweasel Screenshots
|
| |
+ -mozilla-vpn-brand-name = Mozilla VPN
|
| |
+ --profiler-brand-name = Firefox Profiler
|
| |
+ --translations-brand-name = Firefox Translations
|
| |
+ --focus-brand-name = Firefox Focus
|
| |
+ --relay-brand-name = Firefox Relay
|
| |
+ +-profiler-brand-name = Iceweasel Profiler
|
| |
+ +-translations-brand-name = Iceweasel Translations
|
| |
+ +-focus-brand-name = Iceweasel Focus
|
| |
+ +-relay-brand-name = Iceweasel Relay
|
| |
+ -relay-brand-short-name = Relay
|
| |
+ -fakespot-brand-name = Fakespot
|
| |
+
|
| |
+ --
|
| |
+ 2.45.1
|
| |
+
|
| |