Merge branch 'master' into remove-unboxed

3 files changed, 2 insertions, 47 deletions

diff --git a/application/basilisk/locales/en-US/chrome/browser-region/region.properties b/application/basilisk/locales/en-US/chrome/browser-region/region.properties
index e35fc7497..8782ae46f 100644
--- a/application/basilisk/locales/en-US/chrome/browser-region/region.properties
+++ b/application/basilisk/locales/en-US/chrome/browser-region/region.properties
@@ -9,6 +9,7 @@ browser.search.defaultenginename=DuckDuckGo
 browser.search.order.1=DuckDuckGo
 browser.search.order.2=Yahoo
 browser.search.order.3=Bing
+browser.search.order.4=Ecosia
 
 # This is the default set of web based feed handlers shown in the reader
 # selection UI
@@ -20,11 +21,7 @@ browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s
 # profile database.  Note that "new" is defined as "has a different URL"; this
 # means that it's not possible to update the name of existing handler, so 
 # don't make any spelling errors here.
-gecko.handlerService.defaultHandlersVersion=4
-
-# The default set of protocol handlers for webcal:
-gecko.handlerService.schemes.webcal.0.name=30 Boxes
-gecko.handlerService.schemes.webcal.0.uriTemplate=https://30boxes.com/external/widget?refer=ff&url=%s
+gecko.handlerService.defaultHandlersVersion=5
 
 # The default set of protocol handlers for mailto:
 gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
diff --git a/application/basilisk/locales/en-US/chrome/browser/newTab.dtd b/application/basilisk/locales/en-US/chrome/browser/newTab.dtd
index 392aeb957..32a3ad70d 100644
--- a/application/basilisk/locales/en-US/chrome/browser/newTab.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/newTab.dtd
@@ -5,12 +5,9 @@
 <!-- These strings are used in the about:newtab page -->
 <!ENTITY newtab.pageTitle "New Tab">
 <!ENTITY newtab.customize.classic "Show your top sites">
-<!ENTITY newtab.customize.cog.enhanced "Include suggested sites">
 <!ENTITY newtab.customize.cog.title2 "NEW TAB CONTROLS">
 <!ENTITY newtab.customize.cog.learn "Learn about New Tab">
 <!ENTITY newtab.customize.title "Customize your New Tab page">
-<!ENTITY newtab.customize.suggested "Show suggested and your top sites">
-<!ENTITY newtab.customize.topsites "Show your top sites">
 <!ENTITY newtab.customize.blank2 "Show blank page">
 <!ENTITY newtab.undo.removedLabel "Thumbnail removed.">
 <!ENTITY newtab.undo.undoButton "Undo.">
diff --git a/application/basilisk/locales/en-US/chrome/browser/newTab.properties b/application/basilisk/locales/en-US/chrome/browser/newTab.properties
index 7b3fe248e..922aa5847 100644
--- a/application/basilisk/locales/en-US/chrome/browser/newTab.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/newTab.properties
@@ -5,42 +5,3 @@
 newtab.pin=Pin this site at its current position
 newtab.unpin=Unpin this site
 newtab.block=Remove this site
-# LOCALIZATION NOTE(newtab.sponsored.button): This text appears for sponsored
-# and enhanced tiles on the same line as the tile's title, so prefer short
-# strings to avoid overlap. This string should be uppercase.
-newtab.sponsored.button=SPONSORED
-# LOCALIZATION NOTE(newtab.suggested.button): This text appears for sponsored
-# and suggested tiles on the same line as the tile's title, so prefer short
-# strings to avoid overlap. This string should be uppercase.
-newtab.suggested.tag=SUGGESTED
-# LOCALIZATION NOTE(newtab.suggested.button): %1$S will be replaced inline by
-# one of the user's top 100 sites that triggered this suggested tile.
-# This text appears for suggested tiles under the tile's title, so prefer short
-# strings to avoid truncating important text.
-newtab.suggested.button=Suggested for %1$S visitors
-# LOCALIZATION NOTE(newtab.sponsored.explain): %1$S will be replaced inline by
-# the (X) block icon. %2$S will be replaced by an active link using string
-# newtab.learn.link as text.
-newtab.sponsored.explain=This tile is being shown to you on behalf of a Mozilla partner. You can remove it at any time by clicking the %1$S button. %2$S
-# LOCALIZATION NOTE(newtab.sponsored.explain2): %1$S will be replaced inline by
-# the (X) block icon. %2$S will be replaced by an active link using string
-# newtab.learn.link as text.
-newtab.sponsored.explain2=This site is suggested to you on behalf of a Mozilla partner. You can remove it at any time by clicking the %1$S button. %2$S
-# LOCALIZATION NOTE(newtab.suggested.explain): %1$S will be replaced inline by
-# the (X) block icon. %2$S will be replaced by an active link using string
-# newtab.learn.link as text.
-newtab.suggested.explain=This site is suggested to you by Mozilla. You can remove it at any time by clicking the %1$S button. %2$S
-# LOCALIZATION NOTE(newtab.enhanced.explain): %1$S will be replaced inline by
-# the gear icon used to customize the new tab window. %2$S will be replaced by
-# an active link using string newtab.learn.link as text.
-newtab.enhanced.explain=A Mozilla partner has visually enhanced this tile, replacing the screenshot. You can turn off enhanced tiles by clicking the %1$S button for your preferences. %2$S
-newtab.intro1.paragraph1=Now when you open New Tab, you’ll also see sites we think might be interesting to you. Some may be suggested by Mozilla or sponsored by one of our partners.
-# LOCALIZATION NOTE(newtab.intro1.paragraph2): %1$S will be replaced inline by
-# an active link using string newtab.privacy.link as text. %2$S will be replaced
-# inline by the gear icon used to customize the new tab window.
-newtab.intro1.paragraph2=In order to provide this service, some data is automatically sent back to us in accordance with our %1$S. You can turn this off by unchecking the option under the gear icon (%2$S).
-newtab.learn.link=Learn more…
-newtab.privacy.link=Privacy Notice
-newtab.learn.link2=More about New Tab
-newtab.intro.header.update=New Tab got an update!
-newtab.intro.gotit=Got it!