diff --git a/devtools/client/whats-new/src/main.js b/devtools/client/whats-new/src/main.js
index 0b62b2e74f..1afd87d0e1 100644
--- a/devtools/client/whats-new/src/main.js
+++ b/devtools/client/whats-new/src/main.js
@@ -29,7 +29,7 @@ const aside = {
};
const release = {
- title: "What’s New in DevTools (Firefox 76)",
+ title: "What’s New in DevTools (Iceweasel 76)",
linkText: "Read more",
linkUrl: `https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/76?${utmParams}`,
features: [
@@ -66,19 +66,6 @@ const release = {
],
};
-const dev = {
- title: "Experimental Features in Firefox Developer Edition",
- linkUrl: `https://www.mozilla.org/firefox/developer/?${utmParams}`,
- linkText: "Get DevEdition",
- features: [
- {
- header: `Full Asynchronous Stacks in Debugger`,
- description: `Step through event, timeout and promise-based function calls over time with the full-featured async stacks in Debugger.`,
- href: `https://developer.mozilla.org/en-US/docs/Tools/Debugger/UI_Tour?${utmParams}`,
- },
- ],
-};
-
function openLink(href, e) {
return openDocLink(href, {
relatedToCurrent: true,
@@ -172,11 +159,6 @@ class App extends Component {
...release.features
.filter(feature => !feature.hidden)
.map(feature => createFactory(Feature)(feature))
- ),
- dom.h2({}, dom.span({}, dev.title), Link(dev.linkText, dev.linkUrl)),
- dom.ul(
- {},
- ...dev.features.map(feature => createFactory(Feature)(feature))
)
)
);
diff --git a/devtools/startup/aboutdevtools/aboutdevtools.xhtml b/devtools/startup/aboutdevtools/aboutdevtools.xhtml
index 5b0709e..38ea275 100644
--- a/devtools/startup/aboutdevtools/aboutdevtools.xhtml
+++ b/devtools/startup/aboutdevtools/aboutdevtools.xhtml
@@ -89,19 +89,6 @@
-
-
diff --git a/devtools/startup/locales/en-US/aboutDevTools.ftl b/devtools/startup/locales/en-US/aboutDevTools.ftl
index db2146d..e02ab58 100644
--- a/devtools/startup/locales/en-US/aboutDevTools.ftl
+++ b/devtools/startup/locales/en-US/aboutDevTools.ftl
@@ -3,18 +3,18 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
head-title = About Developer Tools
-enable-title = Enable Firefox Developer Tools
-enable-inspect-element-title = Enable Firefox Developer Tools to use Inspect Element
+enable-title = Enable Iceweasel Developer Tools
+enable-inspect-element-title = Enable Iceweasel Developer Tools to use Inspect Element
enable-inspect-element-message = Examine and edit HTML and CSS with the Developer Tools’ Inspector.
-enable-about-debugging-message = Develop and debug WebExtensions, web workers, service workers and more with Firefox Developer Tools.
+enable-about-debugging-message = Develop and debug WebExtensions, web workers, service workers and more with Iceweasel Developer Tools.
enable-key-shortcut-message = You activated a Developer Tools shortcut. If that was a mistake, you can close this Tab.
enable-menu-message = Perfect your website’s HTML, CSS, and JavaScript with tools like Inspector and Debugger.
-enable-common-message = Firefox Developer Tools are disabled by default to give you more control over your browser.
+enable-common-message = Iceweasel Developer Tools are disabled by default to give you more control over your browser.
enable-learn-more-link = Learn more about Developer Tools
enable-enable-button = Enable Developer Tools
enable-close-button = Close this Tab
-welcome-title = Welcome to Firefox Developer Tools!
+welcome-title = Welcome to Iceweasel Developer Tools!
newsletter-title = Mozilla Developer Newsletter
newsletter-message = Get developer news, tricks and resources sent straight to your inbox.
newsletter-email-placeholder =
@@ -24,8 +24,6 @@ newsletter-subscribe-button = Subscribe
newsletter-thanks-title = Thanks!
newsletter-thanks-message = If you haven’t previously confirmed a subscription to a Mozilla-related newsletter you may have to do so. Please check your inbox or your spam filter for an email from us.
-footer-title = Firefox Developer Edition
-footer-message = Looking for more than just Developer Tools? Check out the Firefox browser that is built specifically for developers and modern workflows.
footer-learn-more-link = Learn more
features-learn-more = Learn more
diff --git a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
index edd871b..77870fe 100644
--- a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
+++ b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
@@ -7,7 +7,7 @@ addons-window =
addons-page-title = Add-ons Manager
search-header =
- .placeholder = Search addons.mozilla.org
+ .placeholder = Search www.parabola.nu/packages
.searchbuttonlabel = Search
search-header-shortcut =
@@ -482,7 +482,7 @@ theme-heading-search-label = Find more themes
extension-heading-search-label = Find more extensions
default-heading-search-label = Find more add-ons
addons-heading-search-input =
- .placeholder = Search addons.mozilla.org
+ .placeholder = Search www.parabola.nu/packages
addon-page-options-button =
.title = Tools for all add-ons
diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
index 02eb150..abb3af9 100644
--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
@@ -270,7 +270,7 @@ const ONBOARDING_MESSAGES = () => [
action: { type: "OPEN_PRIVATE_BROWSER_WINDOW" },
},
},
- targeting: "'dynamic' in trailheadTriplet",
+ targeting: "trailheadTriplet in ['supercharge', 'static'] || 'dynamic' in trailheadTriplet",
trigger: { id: "showOnboarding" },
},
{
@@ -314,7 +314,7 @@ const ONBOARDING_MESSAGES = () => [
},
},
targeting:
- "trailheadTriplet in ['supercharge', 'static'] || ('dynamic' in trailheadTriplet && sync.mobileDevices < 1)",
+ "false",
trigger: { id: "showOnboarding" },
},
{
diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
index 4c4ea76..e0f2880 100644
--- a/browser/locales/en-US/chrome/browser-region/region.properties
+++ b/browser/locales/en-US/chrome/browser-region/region.properties
@@ -9,16 +9,3 @@
# don't make any spelling errors here.
gecko.handlerService.defaultHandlersVersion=4
-# The default set of protocol handlers for mailto:
-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
-gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s
-gecko.handlerService.schemes.mailto.1.name=Gmail
-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
-
-# The default set of protocol handlers for irc:
-gecko.handlerService.schemes.irc.0.name=Mibbit
-gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
-
-# The default set of protocol handlers for ircs:
-gecko.handlerService.schemes.ircs.0.name=Mibbit
-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s