From d8ea43891548f1e2a205cf73bb5b39f916a0ee8d Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sat, 12 Mar 2022 17:14:25 +0100 Subject: [PATCH] FSDG: Replace upstream default bookmarks --- browser/base/content/default-bookmarks.html | 50 +++++++++------------ 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/browser/base/content/default-bookmarks.html b/browser/base/content/default-bookmarks.html index c42e81ac23..e2e643bcf2 100644 --- a/browser/base/content/default-bookmarks.html +++ b/browser/base/content/default-bookmarks.html @@ -1,14 +1,14 @@ #filter substitution -#define mozilla_icon data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16'%3E %3Cpath d='M0 0h16v16H0z'/%3E %3Cpath d='M13.994 10.356H15V12h-3.171V7.741c0-1.308-.435-1.81-1.29-1.81-1.04 0-1.46.737-1.46 1.8v2.63h1.006V12H6.918V7.741c0-1.308-.435-1.81-1.291-1.81-1.039 0-1.459.737-1.459 1.8v2.63h1.441V12H1v-1.644h1.006V6.079H1V4.435h3.168v1.139a2.507 2.507 0 0 1 2.3-1.29A2.452 2.452 0 0 1 8.931 5.91 2.535 2.535 0 0 1 11.4 4.284 2.448 2.448 0 0 1 14 6.9v3.458z' fill='%23fff'/%3E %3C/svg%3E - -#define firefox_icon data:image/png;base64,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 - -#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,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAABgElEQVR4AWPouPiRpmjUAjgatSBj+aG0OVuyVhymsgWl2y475zXySikwwIC4lpFDVk3avG0BrXP9mmeV7bhCvgXuxW3M7JwMeAGfpByZFpjHFzAQB2KmrSfZAtuMKgaiAZ+MUuLc7SRY4FbYwkA60HAJiJm8uubQAwIWeJV1MlAAOAREHDJrcFqQMG+ngIK6oKyykLwqAyMjeXZwiUjgtKD+yGMIwyGzmoGBTAs4hcXrgObgi4OiVkpCiUtYov7YU5wW1B194t0ww69ldvjktYouwWRYIGdkQ1Q+iJ28hp2Xn7B5zKzIPAlNw6S52wlbkL3mJJecOq+CBqeIJC6TjUJTMlcdz9lwLmriSuPgJBVbj/D+5SSXRequQVhNN4nIoEJhV77jKgs7B6bprJw85XtuU8GCpNlbSS3gSA4ii4QiTAvElDWpWeH41kxg5eZDSypUrtFKd1zTcA1EpHRDS5rUyQEts+VN7JjYOGR0TWhY6RdsOhc/Y9NoswUJjVoAAE+h555Rgcg2AAAAAElFTkSuQmCC - -#define addon_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAABOFBMVEUAAAAAzdwAydcAyNgA//8AzOYAydcAyNgAyNgA2NgAytoAzNkAytgAydgA29sA0egAyNgAyNgA//8AyNgAydgA//8Ay9cAydcAytkAz90Ay9gA1eoAydgAytsAyNgAytgAydkAydgAydgAyNgAydgAyNcAy9oAydgA//8AytsAy9kAytkAyNgAydgAydkAy9kAzP8AydgAydgAydgAz98AzN0AyNcAyNsAydcAydgAydgAydcAytgAytcAydcAydcAytcAydcAyNcAydcAy9gAztgAydcAydgAzOAAydcAyNgAyNgAytwAyNcAyNgAy9wAyNcAyNcAyNgAydgAyNcAydcAydgA0uEAydkAyNgAyeQA4+MAyNgAydkAzN0AyNsA1f8AyNgAydgAydcA1eMAydgAydcAyNdj6PGJAAAAZ3RSTlMAJFpBAQqm8qwNPiiPygcLv8QEw5cDQMA1JU4MwiuDbl/+6+m4+0XLAj9KePz9cjYFvervEA/IDsfFr+xcgeaOYIDo+ica1OMZ9bXlHe73LM3M35itxs8Rf5ATCbFeHjgGttC5ErzO3WvwaAAAAWxJREFUOMt9kudCwkAQhFcITQWCoaggiBqxoaixYUVsYMMGCmLXff838LIXCJAL84fvmCHsTg4AYMDhlIDkcnu8Po4w6BjiIA0joj+gY1BmGKLEiMIwHNFR9xGjuh8jpMQoYZjRGBGOA8QTHDEUB4hynABwcEqCT8GW2DNSnCYBnJzSoSk0NT2jcphlM/rRXpk5NkRgfmFxSWBml6MrOWNlWBUEEmDKtyYIrGttP66gSP4Nww8mUKzNLd5/zHaJbb1Tl9xnzR2WcGM/5QE8BLvJvf0Dc4HDo8IxUVECL5Vywv7s9Mzwz/WLcFHSsWy8w0sa9+qa/JtbOlUY3mnGLbjnCz9Q4JEfnhCrNb5nXi3w754p8MIPKVWpt6psGJ+vFJBbBUO3GlozzYdsSmCV1NlntiTnegNvPQ29Wx7h7fKrEUvg47PD/6oLpgh8m7//AZEav4b/J/bbb75SAzvR3crY+6y8fLGsQV9ZSvwHF4LQIhDjT+8AAAAASUVORK5CYII= +#define parabola_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC + +#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 gnu_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC + +#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 hnode_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC @@ -29,41 +29,23 @@

default-bookmarks-toolbarfolder

default-bookmarks-toolbarfolder-description
-#ifndef NIGHTLY_BUILD -#ifdef EARLY_BETA_OR_EARLIER

-

default-bookmarks-getting-started
+
Parabola GNU/Linux-libre

-#else +

Parabola GNU/Linux-libre

-

default-bookmarks-getting-started
-

-#endif -

default-bookmarks-firefox-heading

-

-

default-bookmarks-firefox-get-help
-
default-bookmarks-firefox-customize
-#ifdef EARLY_BETA_OR_EARLIER -
default-bookmarks-firefox-community
-#else -
default-bookmarks-firefox-community
-#endif -
default-bookmarks-firefox-about
-

-#else -

-

default-bookmarks-firefox-community
-

-

default-bookmarks-nightly-heading

+
Parabola GNU/Linux-libre +
Parabola GNU/Linux-libre Packages +
Parabola GNU/Linux-libre Wiki +
Parabola GNU/Linux-libre Labs +

+

Free Software Foundation

-

default-bookmarks-nightly-blog
-
default-bookmarks-bugzilla
-
default-bookmarks-mdn
-
default-bookmarks-nightly-tester-tools
-
default-bookmarks-crashes
-
default-bookmarks-planet
+
Free Software Foundation +
The GNU Operating System and the Free Software Movement +
LibrePlanet +
h-node

-#endif -- 2.35.1 From f4475bc77e63f16562aa8360233140522d72d8d4 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sat, 7 May 2022 21:46:48 +0200 Subject: [PATCH] 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 --- .../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 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 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -1011,7 +1011,7 @@ pref("browser.preferences.experimental", true); #else pref("browser.preferences.experimental", false); #endif -pref("browser.preferences.moreFromMozilla", true); +pref("browser.preferences.moreFromMozilla", false); pref("browser.preferences.experimental.hidden", false); 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 --- 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 = [ // extensions/pref/autoconfig/src/nsReadConfig.cpp { file: "resource://gre/defaults/autoconfig/prefcalls.js" }, - // browser/components/preferences/moreFromMozilla.js - // These files URLs are constructed programatically at run time. - { - file: "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple.svg", - }, - { - file: "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple-cn.svg", - }, - { file: "resource://gre/greprefs.js" }, // layout/mathml/nsMathMLChar.cpp diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn index 2131a15cee..dd4697a368 100644 --- a/browser/components/preferences/jar.mn +++ b/browser/components/preferences/jar.mn @@ -14,11 +14,8 @@ browser.jar: content/browser/preferences/containers.js content/browser/preferences/sync.js content/browser/preferences/experimental.js - content/browser/preferences/moreFromMozilla.js content/browser/preferences/fxaPairDevice.xhtml content/browser/preferences/fxaPairDevice.js content/browser/preferences/findInPage.js - content/browser/preferences/more-from-mozilla-qr-code-simple.svg - content/browser/preferences/more-from-mozilla-qr-code-simple-cn.svg content/browser/preferences/web-appearance-dark.svg content/browser/preferences/web-appearance-light.svg diff --git a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg deleted file mode 100644 index 5052db9702..0000000000 --- a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple.svg deleted file mode 100644 index 279595db10..0000000000 --- a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/browser/components/preferences/moreFromMozilla.js b/browser/components/preferences/moreFromMozilla.js index bf97580d81..4d66df1d06 100644 --- a/browser/components/preferences/moreFromMozilla.js +++ b/browser/components/preferences/moreFromMozilla.js @@ -82,36 +82,6 @@ var gMoreFromMozillaPane = { renderProducts() { const isRegionUS = Region.home.toLowerCase() === "us"; let products = [ - { - id: "firefox-mobile", - title_string_id: "more-from-moz-firefox-mobile-title", - description_string_id: "more-from-moz-firefox-mobile-description", - region: "global", - button: { - id: "fxMobile", - type: "link", - label_string_id: "more-from-moz-learn-more-link", - actionURL: AppConstants.isChinaRepack() - ? "https://www.firefox.com.cn/browsers/mobile/" - : "https://www.mozilla.org/firefox/browsers/mobile/", - }, - qrcode: { - title: { - string_id: "more-from-moz-qr-code-box-firefox-mobile-title", - }, - image_src_prefix: - "chrome://browser/content/preferences/more-from-mozilla-qr-code", - button: { - id: "qr-code-send-email", - label: { - string_id: "more-from-moz-qr-code-box-firefox-mobile-button", - }, - actionURL: AppConstants.isChinaRepack() - ? "https://www.firefox.com.cn/mobile/get-app/" - : "https://www.mozilla.org/firefox/mobile/get-app/?v=mfm", - }, - }, - }, { 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 --- a/browser/components/preferences/preferences.js +++ b/browser/components/preferences/preferences.js @@ -10,7 +10,6 @@ /* import-globals-from privacy.js */ /* import-globals-from sync.js */ /* import-globals-from experimental.js */ -/* import-globals-from moreFromMozilla.js */ /* 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() { register_module("paneExperimental", gExperimentalPane); } - NimbusFeatures.moreFromMozilla.recordExposureEvent({ once: true }); - if (NimbusFeatures.moreFromMozilla.getVariable("enabled")) { - document.getElementById("category-more-from-mozilla").hidden = false; - gMoreFromMozillaPane.option = - NimbusFeatures.moreFromMozilla.getVariable("template"); - register_module("paneMoreFromMozilla", gMoreFromMozillaPane); - } // The Sync category needs to be the last of the "real" categories // 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 a355a63d64..835cebe655 100644 --- a/browser/components/preferences/preferences.xhtml +++ b/browser/components/preferences/preferences.xhtml @@ -31,7 +31,6 @@ - @@ -156,16 +155,6 @@ - @@ -214,7 +203,6 @@ #include containers.inc.xhtml #include sync.inc.xhtml #include experimental.inc.xhtml -#include moreFromMozilla.inc.xhtml -- 2.36.0 From 66dec07e773e35b82aa42120441dea0fb185986d Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sat, 7 May 2022 21:51:06 +0200 Subject: [PATCH] Remove promos of Firefox Focus and Klar from Private Browsing Please correct me if I'm wrong, but these are not compatible with FSDG for the same reasons as the original Firefox. --- 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(-) 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 --- 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 pref("browser.promo.focus.disallowed_regions", "cn"); // Default to enabling focus promos to be shown where allowed. -pref("browser.promo.focus.enabled", true); +pref("browser.promo.focus.enabled", false); // 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 --- 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 = [ "chrome://activity-stream/content/data/content/assets/person-typing.svg", "chrome://browser/content/assets/moz-vpn.svg", "chrome://browser/content/assets/vpn-logo.svg", - "chrome://browser/content/assets/focus-promo.png", - "chrome://browser/content/assets/klar-qr-code.svg", // toolkit/components/pdfjs/content/build/pdf.js "resource://pdf.js/web/images/", diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm index 49a76defeb..38407b8e4b 100644 --- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm +++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm @@ -505,315 +505,6 @@ const BASE_MESSAGES = () => [ ], }, }, - { - id: "PB_NEWTAB_FOCUS_PROMO", - type: "default", - template: "pb_newtab", - groups: ["pbNewtab"], - content: { - infoBody: "fluent:about-private-browsing-info-description-simplified", - infoEnabled: true, - infoIcon: "chrome://global/skin/icons/indicator-private-browsing.svg", - infoLinkText: "fluent:about-private-browsing-learn-more-link", - infoTitle: "", - infoTitleEnabled: false, - promoEnabled: true, - promoType: "FOCUS", - promoHeader: "fluent:about-private-browsing-focus-promo-header-c", - promoImageLarge: "chrome://browser/content/assets/focus-promo.png", - promoLinkText: "fluent:about-private-browsing-focus-promo-cta", - promoLinkType: "button", - promoSectionStyle: "below-search", - promoTitle: "fluent:about-private-browsing-focus-promo-text-c", - promoTitleEnabled: true, - promoButton: { - action: { - type: "SHOW_SPOTLIGHT", - data: { - content: { - id: "FOCUS_PROMO", - template: "multistage", - modal: "tab", - backdrop: "transparent", - screens: [ - { - id: "DEFAULT_MODAL_UI", - content: { - logo: { - imageURL: - "chrome://browser/content/assets/focus-logo.svg", - height: "48px", - }, - title: { - string_id: "spotlight-focus-promo-title", - }, - subtitle: { - string_id: "spotlight-focus-promo-subtitle", - }, - dismiss_button: { - action: { - navigate: true, - }, - }, - ios: { - action: { - data: { - args: "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337", - where: "tabshifted", - }, - type: "OPEN_URL", - navigate: true, - }, - }, - android: { - action: { - data: { - args: "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus", - where: "tabshifted", - }, - type: "OPEN_URL", - navigate: true, - }, - }, - tiles: { - type: "mobile_downloads", - data: { - QR_code: { - image_url: - "chrome://browser/content/assets/focus-qr-code.svg", - alt_text: { - string_id: "spotlight-focus-promo-qr-code", - }, - }, - marketplace_buttons: ["ios", "android"], - }, - }, - }, - }, - ], - }, - }, - }, - }, - }, - priority: 2, - frequency: { - custom: [ - { - cap: 3, - period: 604800000, // Max 3 per week - }, - ], - lifetime: 12, - }, - // Exclude the next 2 messages: 1) Klar for en 2) Klar for de - targeting: - "!(region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en') && localeLanguageCode != 'de'", - }, - { - id: "PB_NEWTAB_KLAR_PROMO", - type: "default", - template: "pb_newtab", - groups: ["pbNewtab"], - content: { - infoBody: "fluent:about-private-browsing-info-description-simplified", - infoEnabled: true, - infoIcon: "chrome://global/skin/icons/indicator-private-browsing.svg", - infoLinkText: "fluent:about-private-browsing-learn-more-link", - infoTitle: "", - infoTitleEnabled: false, - promoEnabled: true, - promoType: "FOCUS", - promoHeader: "fluent:about-private-browsing-focus-promo-header-c", - promoImageLarge: "chrome://browser/content/assets/focus-promo.png", - promoLinkText: "Download Firefox Klar", - promoLinkType: "button", - promoSectionStyle: "below-search", - promoTitle: - "Firefox Klar clears your history every time while blocking ads and trackers.", - promoTitleEnabled: true, - promoButton: { - action: { - type: "SHOW_SPOTLIGHT", - data: { - content: { - id: "KLAR_PROMO", - template: "multistage", - modal: "tab", - backdrop: "transparent", - screens: [ - { - id: "DEFAULT_MODAL_UI", - order: 0, - content: { - logo: { - imageURL: - "chrome://browser/content/assets/focus-logo.svg", - height: "48px", - }, - title: "Get Firefox Klar", - subtitle: { - string_id: "spotlight-focus-promo-subtitle", - }, - dismiss_button: { - action: { - navigate: true, - }, - }, - ios: { - action: { - data: { - args: "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754", - where: "tabshifted", - }, - type: "OPEN_URL", - navigate: true, - }, - }, - android: { - action: { - data: { - args: "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar", - where: "tabshifted", - }, - type: "OPEN_URL", - navigate: true, - }, - }, - tiles: { - type: "mobile_downloads", - data: { - QR_code: { - image_url: - "chrome://browser/content/assets/klar-qr-code.svg", - alt_text: "Scan the QR code to get Firefox Klar", - }, - marketplace_buttons: ["ios", "android"], - }, - }, - }, - }, - ], - }, - }, - }, - }, - }, - priority: 2, - frequency: { - custom: [ - { - cap: 3, - period: 604800000, // Max 3 per week - }, - ], - lifetime: 12, - }, - targeting: "region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en'", - }, - { - id: "PB_NEWTAB_KLAR_PROMO_DE", - type: "default", - template: "pb_newtab", - groups: ["pbNewtab"], - content: { - infoBody: "fluent:about-private-browsing-info-description-simplified", - infoEnabled: true, - infoIcon: "chrome://global/skin/icons/indicator-private-browsing.svg", - infoLinkText: "fluent:about-private-browsing-learn-more-link", - infoTitle: "", - infoTitleEnabled: false, - promoEnabled: true, - promoType: "FOCUS", - promoHeader: "fluent:about-private-browsing-focus-promo-header-c", - promoImageLarge: "chrome://browser/content/assets/focus-promo.png", - promoLinkText: "fluent:about-private-browsing-focus-promo-cta", - promoLinkType: "button", - promoSectionStyle: "below-search", - promoTitle: "fluent:about-private-browsing-focus-promo-text-c", - promoTitleEnabled: true, - promoButton: { - action: { - type: "SHOW_SPOTLIGHT", - data: { - content: { - id: "FOCUS_PROMO", - template: "multistage", - modal: "tab", - backdrop: "transparent", - screens: [ - { - id: "DEFAULT_MODAL_UI", - content: { - logo: { - imageURL: - "chrome://browser/content/assets/focus-logo.svg", - height: "48px", - }, - title: { - string_id: "spotlight-focus-promo-title", - }, - subtitle: { - string_id: "spotlight-focus-promo-subtitle", - }, - dismiss_button: { - action: { - navigate: true, - }, - }, - ios: { - action: { - data: { - args: "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754", - where: "tabshifted", - }, - type: "OPEN_URL", - navigate: true, - }, - }, - android: { - action: { - data: { - args: "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar", - where: "tabshifted", - }, - type: "OPEN_URL", - navigate: true, - }, - }, - tiles: { - type: "mobile_downloads", - data: { - QR_code: { - image_url: - "chrome://browser/content/assets/klar-qr-code.svg", - alt_text: { - string_id: "spotlight-focus-promo-qr-code", - }, - }, - marketplace_buttons: ["ios", "android"], - }, - }, - }, - }, - ], - }, - }, - }, - }, - }, - priority: 2, - frequency: { - custom: [ - { - cap: 3, - period: 604800000, // Max 3 per week - }, - ], - lifetime: 12, - }, - targeting: "localeLanguageCode == 'de'", - }, { id: "PB_NEWTAB_PIN_PROMO", template: "pb_newtab", diff --git a/browser/components/newtab/lib/PanelTestProvider.sys.mjs b/browser/components/newtab/lib/PanelTestProvider.sys.mjs index b5ff59290a..eb5fc60451 100644 --- a/browser/components/newtab/lib/PanelTestProvider.sys.mjs +++ b/browser/components/newtab/lib/PanelTestProvider.sys.mjs @@ -367,85 +367,6 @@ const MESSAGES = () => [ frequency: { lifetime: 3 }, trigger: { id: "defaultBrowserCheck" }, }, - { - id: "PB_FOCUS_PROMO", - groups: ["panel-test-provider"], - template: "spotlight", - content: { - template: "multistage", - backdrop: "transparent", - screens: [ - { - id: "PBM_FIREFOX_FOCUS", - order: 0, - content: { - logo: { - imageURL: "chrome://browser/content/assets/focus-logo.svg", - height: "48px", - }, - title: { - string_id: "spotlight-focus-promo-title", - }, - subtitle: { - string_id: "spotlight-focus-promo-subtitle", - }, - dismiss_button: { - action: { - dismiss: true, - }, - }, - ios: { - action: { - data: { - args: "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337", - where: "tabshifted", - }, - type: "OPEN_URL", - navigate: true, - }, - }, - android: { - action: { - data: { - args: "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus", - where: "tabshifted", - }, - type: "OPEN_URL", - navigate: true, - }, - }, - email_link: { - action: { - data: { - args: "https://mozilla.org", - where: "tabshifted", - }, - type: "OPEN_URL", - navigate: true, - }, - }, - tiles: { - type: "mobile_downloads", - data: { - QR_code: { - image_url: - "chrome://browser/content/assets/focus-qr-code.svg", - alt_text: { - string_id: "spotlight-focus-promo-qr-code", - }, - }, - email: { - link_text: "Email yourself a link", - }, - marketplace_buttons: ["ios", "android"], - }, - }, - }, - }, - ], - }, - trigger: { id: "defaultBrowserCheck" }, - }, { id: "PB_NEWTAB_VPN_PROMO", template: "pb_newtab", diff --git a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg b/browser/components/privatebrowsing/content/assets/focus-qr-code.svg deleted file mode 100644 index f182567314..0000000000 --- a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/browser/components/privatebrowsing/content/assets/klar-qr-code.svg b/browser/components/privatebrowsing/content/assets/klar-qr-code.svg deleted file mode 100644 index 2217ca055c..0000000000 --- a/browser/components/privatebrowsing/content/assets/klar-qr-code.svg +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- 2.36.0 From 842d945be96cddf4192fed890066f96bc9894a83 Mon Sep 17 00:00:00 2001 From: grizzlyuser 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]. [1] https://labs.parabola.nu/issues/2409#note-4 --- browser/components/newtab/lib/CFRPageActions.jsm | 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/newtab/lib/CFRPageActions.jsm b/browser/components/newtab/lib/CFRPageActions.jsm index 2ca59d73e3..6e06ee7c93 100644 --- a/browser/components/newtab/lib/CFRPageActions.jsm +++ b/browser/components/newtab/lib/CFRPageActions.jsm @@ -38,7 +38,7 @@ const SUMO_BASE_URL = Services.urlFormatter.formatURLPref( "app.support.baseURL" ); const ADDONS_API_URL = - "https://services.addons.mozilla.org/api/v4/addons/addon"; + ""; 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 --- a/devtools/client/framework/devtools-browser.js +++ b/devtools/client/framework/devtools-browser.js @@ -155,8 +155,9 @@ var gDevToolsBrowser = (exports.gDevToolsBrowser = { toggleMenuItem("menu_browserConsole", false); toggleMenuItem("menu_responsiveUI", false); toggleMenuItem("menu_eyedropper", false); - toggleMenuItem("extensionsForDevelopers", false); } + + toggleMenuItem("extensionsForDevelopers", false); }, /** diff --git a/devtools/client/menus.js b/devtools/client/menus.js index b47e1c4a3f..fd62bfd3df 100644 --- a/devtools/client/menus.js +++ b/devtools/client/menus.js @@ -189,7 +189,7 @@ exports.menuitems = [ appMenuL10nId: "appmenu-developer-tools-extensions", oncommand(event) { openDocLink( - "https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/" + "" ); }, }, -- 2.39.0 From a985a80d5df1226f4d7f84a72dd6c03b51fc68e4 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 12 Mar 2023 21:57:14 +0100 Subject: [PATCH] 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 nonfree. Replace the regular DDG URL with DDG HTML URL and rename the search engine accordingly. Currently, it looks like HTML version does not have any JS. Also: 1. Change search method from GET to POST, because with GET, DDG HTML will mangle URLs in search results, so that [1] becomes [2]. Not sure why that is done. Probably to avoid leaking search terms to visited sites (via Referer header?) at the cost of leaking clicked URLs to DDG, so this can still be a privacy concern. BTW, POST is the default search method when searching directly from DDG HTML home page. 2. Remove suspicious t=ffab URL parameter, because it can tell DDG that this particular search extension is the origin of the search. Private search engine that doesn't track its users, huh? [1] https://www.gnu.org/ [2] https://duckduckgo.com/l/?uddg=https%3A%2F%2Fwww.gnu.org%2F&rut=b1ab1ab1a... --- .../components/search/extensions/ddg/manifest.json | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/browser/components/search/extensions/ddg/manifest.json b/browser/components/search/extensions/ddg/manifest.json index 1e1bffed47..14b6cf9f5a 100644 --- a/browser/components/search/extensions/ddg/manifest.json +++ b/browser/components/search/extensions/ddg/manifest.json @@ -1,6 +1,6 @@ { - "name": "DuckDuckGo", - "description": "Search DuckDuckGo", + "name": "DuckDuckGo HTML", + "description": "Search DuckDuckGo HTML", "manifest_version": 2, "version": "1.4", "browser_specific_settings": { @@ -16,10 +16,9 @@ "chrome_settings_overrides": { "search_provider": { "keyword": ["@duckduckgo", "@ddg"], - "name": "DuckDuckGo", - "search_url": "https://duckduckgo.com/", - "search_form": "https://duckduckgo.com/", - "search_url_get_params": "t=ffab&q={searchTerms}", + "name": "DuckDuckGo HTML", + "search_url": "https://html.duckduckgo.com/html/", + "search_url_post_params": "q={searchTerms}", "suggest_url": "https://ac.duckduckgo.com/ac/", "suggest_url_get_params": "q={searchTerms}&type=list" } -- 2.39.2 diff --git a/browser/app/permissions b/browser/app/permissions index 1c72a96de8..052a6a5c83 100644 --- a/browser/app/permissions +++ b/browser/app/permissions @@ -15,9 +15,6 @@ origin uitour 1 https://support.mozilla.org origin uitour 1 about:home origin uitour 1 about:newtab -# XPInstall -origin install 1 https://addons.mozilla.org - # Remote troubleshooting 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 --- a/browser/components/preferences/sync.inc.xhtml +++ b/browser/components/preferences/sync.inc.xhtml @@ -35,22 +35,6 @@ - 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 @@ -34,14 +34,14 @@ # 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. -# `` - Android logo icon -# `` - Link to Android Download -# `` - iOS logo icon -# `` - 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 Android or iOS 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 --- 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 } vpn-title-subscribed = VPN: Subscribed # Note This text is not being translated, and the
will need to be removed if or when it does get translated -vpn-header-content-subscribed = Using the { -mozilla-vpn-brand-name } encrypts all your traffic and hides your location — on up to 5 devices. Get the most from your subscription — add it from
the Google Play Store or Apple App Store. +vpn-header-content-subscribed = Using the { -mozilla-vpn-brand-name } encrypts all your traffic and hides your location — on up to 5 devices. vpn-banner-header = Protection that extends beyond the browser # Note This text is not being translated, and the
will need to be removed if or when it does get translated diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html index 1374c30fd7..0d70747bf7 100644 --- a/browser/components/protections/content/protections.html +++ b/browser/components/protections/content/protections.html @@ -572,16 +572,6 @@ class="content subscribed" data-l10n-id="vpn-header-content-subscribed" > - -

{ this.doc.sendTelemetryEvent("click", "vpn_card_link"); }); - let androidVPNAppLink = document.getElementById( - "vpn-google-playstore-link" - ); - androidVPNAppLink.href = RPMGetStringPref( - "browser.contentblocking.report.vpn-android.url" - ); - androidVPNAppLink.addEventListener("click", () => { - document.sendTelemetryEvent("click", "vpn_app_link_android"); - }); - let iosVPNAppLink = document.getElementById("vpn-app-store-link"); - iosVPNAppLink.href = RPMGetStringPref( - "browser.contentblocking.report.vpn-ios.url" - ); - iosVPNAppLink.addEventListener("click", () => { - document.sendTelemetryEvent("click", "vpn_app_link_ios"); - }); const vpnBanner = this.doc.querySelector(".vpn-banner"); const exitIcon = vpnBanner.querySelector(".exit-icon");