Bug 1563243 - Add optimistic images, string robustness and bug fixes to New Tab Page r=pdahiya,fluent-reviewers,flod

Differential Revision: https://phabricator.services.mozilla.com/D36764 --HG-- extra : moz-landing-system : lando
2024-10-10 03:45:46 +00:00 · 2019-07-03 23:49:07 +00:00 · 2019-07-03 23:49:07 +00:00 · 475d41e647
commit 475d41e647
parent e610854d8e
347 changed files with 964 additions and 8592 deletions
--- a/browser/components/newtab/.eslintrc.js
+++ b/browser/components/newtab/.eslintrc.js
@ -45,6 +45,7 @@ module.exports = {
      "files": [
        "content-src/asrouter/templates/OnboardingMessage/**",
        "content-src/asrouter/templates/Trailhead/**",
+        "content-src/asrouter/templates/StartupOverlay/StartupOverlay.jsx",
        "content-src/components/TopSites/**",
        "content-src/components/MoreRecommendations/MoreRecommendations.jsx",
        "content-src/components/CollapsibleSection/CollapsibleSection.jsx"
--- a/browser/components/newtab/.mcignore
+++ b/browser/components/newtab/.mcignore
@ -5,6 +5,7 @@ npm-debug.log
 *.pyc
 *.update.rdf
 .gitignore
+.eslintcache

 /.git/
 /data/locales.json
--- a/browser/components/newtab/AboutNewTabService.jsm
+++ b/browser/components/newtab/AboutNewTabService.jsm
@ -19,7 +19,7 @@ const TOPIC_CONTENT_DOCUMENT_INTERACTIVE = "content-document-interactive";

 // Automated tests ensure packaged locales are in this list. Copied output of:
 // https://github.com/mozilla/activity-stream/blob/master/bin/render-activity-stream-html.js
-const ACTIVITY_STREAM_BCP47 = "en-US ach an ar ast az be bg bn br bs ca cak crh cs cy da de dsb el en-CA en-GB eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM ia id is it ja ka kab kk km kn ko lij lo lt ltg lv mk mr ms my nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta te th tl tr trs uk ur uz vi zh-CN zh-TW".split(" ");
+const ACTIVITY_STREAM_BCP47 = "en-US".split(" ");

 const ABOUT_URL = "about:newtab";
 const BASE_URL = "resource://activity-stream/";
--- a/browser/components/newtab/content-src/asrouter/asrouter-content.jsx
+++ b/browser/components/newtab/content-src/asrouter/asrouter-content.jsx
@ -1,4 +1,3 @@
-import {addLocaleData, IntlProvider} from "react-intl";
 import {actionCreators as ac} from "common/Actions.jsm";
 import {OUTGOING_MESSAGE_NAME as AS_GENERAL_OUTGOING_MESSAGE_NAME} from "content-src/lib/init-store";
 import {generateBundles} from "./rich-text-strings";
@ -216,11 +215,6 @@ export class ASRouterUISurface extends React.PureComponent {
  }

  componentWillMount() {
-    if (global.document) {
-      // Add locale data for StartupOverlay because it uses react-intl
-      addLocaleData(global.document.documentElement.lang);
-    }
-
    const endpoint = ASRouterUtils.getPreviewEndpoint();
    if (endpoint && endpoint.theme === "dark") {
      global.window.dispatchEvent(new CustomEvent("LightweightTheme:Set", {detail: {data: NEWTAB_DARK_THEME}}));
@ -288,12 +282,10 @@ export class ASRouterUISurface extends React.PureComponent {
    if (message.template === "fxa_overlay") {
      global.document.body.classList.add("fxa");
      return (
-        <IntlProvider locale={global.document.documentElement.lang} messages={global.gActivityStreamStrings}>
-          <StartupOverlay
-            onReady={this.triggerOnboarding}
-            onBlock={this.onDismissById(message.id)}
-            dispatch={this.props.dispatch} />
-        </IntlProvider>
+        <StartupOverlay
+          onReady={this.triggerOnboarding}
+          onBlock={this.onDismissById(message.id)}
+          dispatch={this.props.dispatch} />
      );
    } else if (message.template === "return_to_amo_overlay") {
      global.document.body.classList.add("amo");
--- a/browser/components/newtab/content-src/asrouter/templates/StartupOverlay/StartupOverlay.jsx
+++ b/browser/components/newtab/content-src/asrouter/templates/StartupOverlay/StartupOverlay.jsx
@ -1,8 +1,13 @@
 import {actionCreators as ac, actionTypes as at} from "common/Actions.jsm";
-import {FormattedMessage, injectIntl} from "react-intl";
 import {connect} from "react-redux";
 import React from "react";

+const FLUENT_FILES = [
+  "branding/brand.ftl",
+  "browser/branding/sync-brand.ftl",
+  "browser/newtab/onboarding.ftl",
+];
+
 export class _StartupOverlay extends React.PureComponent {
  constructor(props) {
    super(props);
@ -43,6 +48,16 @@ export class _StartupOverlay extends React.PureComponent {
    }
  }

+  async componentWillMount() {
+    FLUENT_FILES.forEach(file => {
+      const link = document.head.appendChild(document.createElement("link"));
+      link.href = file;
+      link.rel = "localization";
+    });
+
+    await this.componentWillUpdate(this.props);
+  }
+
  componentDidMount() {
    this.initScene();
  }
@ -109,21 +124,22 @@ export class _StartupOverlay extends React.PureComponent {
      return null;
    }

-    let termsLink = (<a href={`${this.props.fxa_endpoint}/legal/terms?${this.utmParams}`} target="_blank" rel="noopener noreferrer"><FormattedMessage id="firstrun_terms_of_service" /></a>);
-    let privacyLink = (<a href={`${this.props.fxa_endpoint}/legal/privacy?${this.utmParams}`} target="_blank" rel="noopener noreferrer"><FormattedMessage id="firstrun_privacy_notice" /></a>);
-
+ 
    return (
      <div className={`overlay-wrapper ${this.state.show ? "show" : ""}`}>
        <div className="background" />
        <div className="firstrun-scene">
          <div className="fxaccounts-container">
            <div className="firstrun-left-divider">
-              <h1 className="firstrun-title"><FormattedMessage id="firstrun_title" /></h1>
-              <p className="firstrun-content"><FormattedMessage id="firstrun_content" /></p>
-              <a className="firstrun-link" href={`https://www.mozilla.org/firefox/features/sync/?${this.utmParams}`} target="_blank" rel="noopener noreferrer"><FormattedMessage id="firstrun_learn_more_link" /></a>
+              <h1 className="firstrun-title" data-l10n-id="onboarding-sync-welcome-header" />
+              <p className="firstrun-content" data-l10n-id="onboarding-sync-welcome-content" />
+              <a className="firstrun-link" href={`https://www.mozilla.org/firefox/features/sync/?${this.utmParams}`} target="_blank" rel="noopener noreferrer" data-l10n-id="onboarding-sync-welcome-learn-more-link" />
            </div>
            <div className="firstrun-sign-in">
-              <p className="form-header"><FormattedMessage id="firstrun_form_header" /><span className="sub-header"><FormattedMessage id="firstrun_form_sub_header" /></span></p>
+              <p className="form-header">
+                <span data-l10n-id="onboarding-sync-form-header"/>
+                <span className="sub-header" data-l10n-id="onboarding-sync-form-sub-header" />
+              </p>
              <form method="get" action={this.props.fxa_endpoint} target="_blank" rel="noopener noreferrer" onSubmit={this.onSubmit}>
                <input name="service" type="hidden" value="sync" />
                <input name="action" type="hidden" value="email" />
@ -136,19 +152,19 @@ export class _StartupOverlay extends React.PureComponent {
                <input name="device_id" type="hidden" value={this.state.deviceId} />
                <input name="flow_id" type="hidden" value={this.state.flowId} />
                <input name="flow_begin_time" type="hidden" value={this.state.flowBeginTime} />
-                <span className="error">{this.props.intl.formatMessage({id: "firstrun_invalid_input"})}</span>
-                <input className="email-input" name="email" type="email" required="true" onInvalid={this.onInputInvalid} placeholder={this.props.intl.formatMessage({id: "firstrun_email_input_placeholder"})} onChange={this.onInputChange} />
+                <span className="error" data-l10n-id="onboarding-sync-form-invalid-input" />
+                <input className="email-input" name="email" type="email" required="true" onInvalid={this.onInputInvalid} onChange={this.onInputChange} data-l10n-id="onboarding-sync-form-input" />
                <div className="extra-links">
-                  <FormattedMessage
-                    id="firstrun_extra_legal_links"
-                    values={{
-                      terms: termsLink,
-                      privacy: privacyLink,
-                    }} />
+                <p data-l10n-id="onboarding-sync-legal-notice">
+                  <a data-l10n-name="terms" target="_blank" rel="noopener noreferrer"
+                    href={`${this.props.fxa_endpoint}/legal/terms?${this.utmParams}`} />
+                  <a data-l10n-name="privacy" target="_blank" rel="noopener noreferrer"
+                    href={`${this.props.fxa_endpoint}/legal/privacy?${this.utmParams}`} />
+                </p>
                </div>
-                <button className="continue-button" type="submit"><FormattedMessage id="firstrun_continue_to_login" /></button>
+                <button className="continue-button" type="submit" data-l10n-id="onboarding-sync-form-continue-button" />
              </form>
-              <button className="skip-button" disabled={!!this.state.emailInput} onClick={this.clickSkip}><FormattedMessage id="firstrun_skip_login" /></button>
+              <button className="skip-button" disabled={!!this.state.emailInput} onClick={this.clickSkip} data-l10n-id="onboarding-sync-form-skip-login-button" />
            </div>
          </div>
        </div>
@ -158,4 +174,4 @@ export class _StartupOverlay extends React.PureComponent {
 }

 const getState = state => ({fxa_endpoint: state.Prefs.values.fxa_endpoint});
-export const StartupOverlay = connect(getState)(injectIntl(_StartupOverlay));
+export const StartupOverlay = connect(getState)(_StartupOverlay);
--- a/browser/components/newtab/content-src/asrouter/templates/Trailhead/Trailhead.jsx
+++ b/browser/components/newtab/content-src/asrouter/templates/Trailhead/Trailhead.jsx
@ -1,5 +1,4 @@
 import {actionCreators as ac, actionTypes as at} from "common/Actions.jsm";
-import {injectIntl} from "react-intl";
 import {ModalOverlayWrapper} from "../../components/ModalOverlay/ModalOverlay";
 import {OnboardingCard} from "../OnboardingMessage/OnboardingMessage";
 import React from "react";
@ -22,7 +21,7 @@ const FOCUSABLE_SELECTOR = [
  "[tabindex]:not([tabindex='-1'])",
 ].join(", ");

-export class _Trailhead extends React.PureComponent {
+export class Trailhead extends React.PureComponent {
  constructor(props) {
    super(props);
    this.closeModal = this.closeModal.bind(this);
@ -182,13 +181,6 @@ export class _Trailhead extends React.PureComponent {
    this.setState({showCards: true});
  }

-  getStringValue(str) {
-    if (str.property_id) {
-      str.value = this.props.intl.formatMessage({id: str.property_id});
-    }
-    return str.value;
-  }
-
  /**
   * Takes in a url as a string or URL object and returns a URL object with the
   * utm_* parameters added to it. If a URL object is passed in, the paraemeters
@ -233,30 +225,29 @@ export class _Trailhead extends React.PureComponent {
      "trailhead",
      content && content.className,
    ].filter(v => v).join(" ");
+
    return (<>
    {this.state.isModalOpen && content ? <ModalOverlayWrapper innerClassName={innerClassName} onClose={this.closeModal} id="trailheadDialog" headerId="trailheadHeader">
      <div className="trailheadInner">
        <div className="trailheadContent">
          <h1 data-l10n-id={content.title.string_id}
-            id="trailheadHeader">{this.getStringValue(content.title)}</h1>
+            id="trailheadHeader" />
          {content.subtitle &&
-            <p data-l10n-id={content.subtitle.string_id}>{this.getStringValue(content.subtitle)}</p>
+            <p data-l10n-id={content.subtitle.string_id} />
          }
          <ul className="trailheadBenefits">
            {content.benefits.map(item => (
              <li key={item.id} className={item.id}>
-                <h3 data-l10n-id={item.title.string_id}>{this.getStringValue(item.title)}</h3>
-                <p data-l10n-id={item.text.string_id}>{this.getStringValue(item.text)}</p>
+                <h3 data-l10n-id={item.title.string_id} />
+                <p data-l10n-id={item.text.string_id} />
              </li>
            ))}
          </ul>
-          <a className="trailheadLearn" data-l10n-id={content.learn.text.string_id} href={this.addUtmParams(content.learn.url)} target="_blank" rel="noopener noreferrer">
-            {this.getStringValue(content.learn.text)}
-          </a>
+          <a className="trailheadLearn" data-l10n-id={content.learn.text.string_id} href={this.addUtmParams(content.learn.url)} target="_blank" rel="noopener noreferrer" />
        </div>
        <div role="group" aria-labelledby="joinFormHeader" aria-describedby="joinFormBody" className="trailheadForm">
-          <h3 id="joinFormHeader" data-l10n-id={content.form.title.string_id}>{this.getStringValue(content.form.title)}</h3>
-          <p id="joinFormBody" data-l10n-id={content.form.text.string_id}>{this.getStringValue(content.form.text)}</p>
+          <h3 id="joinFormHeader" data-l10n-id={content.form.title.string_id} />
+          <p id="joinFormBody" data-l10n-id={content.form.text.string_id} />
          <form method="get" action={this.props.fxaEndpoint} target="_blank" rel="noopener noreferrer" onSubmit={this.onSubmit}>
            <input name="service" type="hidden" value="sync" />
            <input name="action" type="hidden" value="email" />
@ -272,7 +263,6 @@ export class _Trailhead extends React.PureComponent {
            <p data-l10n-id="onboarding-join-form-email-error" className="error" />
            <input
              data-l10n-id={content.form.email.string_id}
-              placeholder={this.getStringValue(content.form.email)}
              name="email"
              type="email"
              onInvalid={this.onInputInvalid}
@ -283,9 +273,7 @@ export class _Trailhead extends React.PureComponent {
              <a data-l10n-name="privacy" target="_blank" rel="noopener noreferrer"
                href={this.addUtmParams("https://accounts.firefox.com/legal/privacy")} />
            </p>
-            <button data-l10n-id={content.form.button.string_id} type="submit">
-              {this.getStringValue(content.form.button)}
-            </button>
+            <button data-l10n-id={content.form.button.string_id} type="submit" />
          </form>
        </div>
      </div>
@ -293,7 +281,7 @@ export class _Trailhead extends React.PureComponent {
      <button className="trailheadStart"
        data-l10n-id={content.skipButton.string_id}
        onBlur={this.onStartBlur}
-        onClick={this.closeModal}>{this.getStringValue(content.skipButton)}</button>
+        onClick={this.closeModal} />
    </ModalOverlayWrapper> : null}
    {(cards && cards.length) ? <div className={`trailheadCards ${this.state.showCardPanel ? "expanded" : "collapsed"}`}>
      <div className="trailheadCardsInner"
@ -312,13 +300,10 @@ export class _Trailhead extends React.PureComponent {
        {this.state.showCardPanel &&
          <button
            className="icon icon-dismiss" onClick={this.hideCardPanel}
-            title={props.intl.formatMessage({id: "menu_action_dismiss"})}
-            aria-label={props.intl.formatMessage({id: "menu_action_dismiss"})} />
+            data-l10n-id="onboarding-cards-dismiss" />
        }
      </div>
    </div> : null}
    </>);
  }
 }
-
-export const Trailhead = injectIntl(_Trailhead);
--- a/browser/components/newtab/content-src/components/Base/Base.jsx
+++ b/browser/components/newtab/content-src/components/Base/Base.jsx
@ -1,5 +1,4 @@
 import {actionCreators as ac, actionTypes as at} from "common/Actions.jsm";
-import {addLocaleData, IntlProvider} from "react-intl";
 import {ASRouterAdmin} from "content-src/components/ASRouterAdmin/ASRouterAdmin";
 import {ASRouterUISurface} from "../../asrouter/asrouter-content";
 import {ConfirmDialog} from "content-src/components/ConfirmDialog/ConfirmDialog";
@ -16,13 +15,6 @@ const PrefsButton = props => (
  </div>
 );

-// Add the locale data for pluralization and relative-time formatting for now,
-// this just uses english locale data. We can make this more sophisticated if
-// more features are needed.
-function addLocaleDataForReactIntl(locale) {
-  addLocaleData([{locale, parentLocale: "en"}]);
-}
-
 // Returns a function will not be continuously triggered when called. The
 // function will be triggered if called again after `wait` milliseconds.
 function debounce(func, wait) {
@ -39,8 +31,6 @@ function debounce(func, wait) {

 export class _Base extends React.PureComponent {
  componentWillMount() {
-    const {locale} = this.props;
-    addLocaleDataForReactIntl(locale);
    if (this.props.isFirstrun) {
      global.document.body.classList.add("welcome", "hide-main");
    }
@ -68,21 +58,21 @@ export class _Base extends React.PureComponent {

  render() {
    const {props} = this;
-    const {App, locale, strings} = props;
+    const {App} = props;
    const isDevtoolsEnabled = props.Prefs.values["asrouter.devtoolsEnabled"];

    if (!App.initialized) {
      return null;
    }

-    return (<IntlProvider locale={locale} messages={strings}>
+    return (
      <ErrorBoundary className="base-content-fallback">
        <React.Fragment>
          <BaseContent {...this.props} />
          {isDevtoolsEnabled ? <ASRouterAdmin /> : null}
        </React.Fragment>
      </ErrorBoundary>
-    </IntlProvider>);
+    );
  }
 }

--- a/browser/components/newtab/content-src/components/Card/Card.jsx
+++ b/browser/components/newtab/content-src/components/Card/Card.jsx
@ -1,7 +1,6 @@
 import {actionCreators as ac, actionTypes as at} from "common/Actions.jsm";
 import {cardContextTypes} from "./types";
 import {connect} from "react-redux";
-import {injectIntl} from "react-intl";
 import {LinkMenu} from "content-src/components/LinkMenu/LinkMenu";
 import React from "react";
 import {ScreenshotUtils} from "content-src/lib/screenshot-utils";
@ -247,7 +246,7 @@ export class _Card extends React.PureComponent {
      </a>
      {!props.placeholder && <button aria-haspopup="true"
        data-l10n-id="newtab-menu-content-tooltip"
-        data-l10n-args={`{ "title": "${title}" }`}
+        data-l10n-args={JSON.stringify({title})}
        className="context-menu-button icon"
        onClick={this.onMenuButtonClick} />}
      {isContextMenuOpen &&
@ -265,5 +264,5 @@ export class _Card extends React.PureComponent {
  }
 }
 _Card.defaultProps = {link: {}};
-export const Card = connect(state => ({platform: state.Prefs.values.platform}))(injectIntl(_Card));
+export const Card = connect(state => ({platform: state.Prefs.values.platform}))(_Card);
 export const PlaceholderCard = props => <Card placeholder={true} className={props.className} />;
--- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSCard/DSCard.jsx
+++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSCard/DSCard.jsx
@ -67,7 +67,6 @@ export class DSCard extends React.PureComponent {
          id={this.props.id}
          index={this.props.pos}
          dispatch={this.props.dispatch}
-          intl={this.props.intl}
          url={this.props.url}
          title={this.props.title}
          source={this.props.source}
--- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSImage/DSImage.jsx
+++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSImage/DSImage.jsx
@ -42,7 +42,13 @@ export class DSImage extends React.PureComponent {
  }

  componentDidMount() {
-    this.observer = new IntersectionObserver(this.onSeen.bind(this));
+    this.observer = new IntersectionObserver(this.onSeen.bind(this), {
+      // Assume an image will be eventually seen if it is within 520px of the viewport
+      // This is half the average Desktop vertical screen size:
+      // http://gs.statcounter.com/screen-resolution-stats/desktop/north-america
+      rootMargin: `540px`,
+    });
+
    this.observer.observe(ReactDOM.findDOMNode(this));
  }

--- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSLinkMenu/DSLinkMenu.jsx
+++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSLinkMenu/DSLinkMenu.jsx
@ -1,8 +1,7 @@
-import {injectIntl} from "react-intl";
 import {LinkMenu} from "content-src/components/LinkMenu/LinkMenu";
 import React from "react";

-export class _DSLinkMenu extends React.PureComponent {
+export class DSLinkMenu extends React.PureComponent {
  constructor(props) {
    super(props);
    this.state = {
@ -58,7 +57,7 @@ export class _DSLinkMenu extends React.PureComponent {
              aria-haspopup="true"
              className="context-menu-button icon"
              data-l10n-id="newtab-menu-content-tooltip"
-              data-l10n-args={`{ "title": "${title}" }`}
+              data-l10n-args={JSON.stringify({title})}
              onClick={this.onMenuButtonClick} />
      {isContextMenuOpen &&
        <LinkMenu
@ -83,5 +82,3 @@ export class _DSLinkMenu extends React.PureComponent {
    </div>);
  }
 }
-
-export const DSLinkMenu = injectIntl(_DSLinkMenu);
--- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/Hero/Hero.jsx
+++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/Hero/Hero.jsx
@ -105,7 +105,6 @@ export class Hero extends React.PureComponent {
            id={heroRec.id}
            index={heroRec.pos}
            dispatch={this.props.dispatch}
-            intl={this.props.intl}
            url={heroRec.url}
            title={heroRec.title}
            source={heroRec.domain}
--- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/List/List.jsx
+++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/List/List.jsx
@ -76,7 +76,6 @@ export class ListItem extends React.PureComponent {
          id={this.props.id}
          index={this.props.pos}
          dispatch={this.props.dispatch}
-          intl={this.props.intl}
          url={this.props.url}
          title={this.props.title}
          source={this.props.source}
--- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/Navigation/_Navigation.scss
+++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/Navigation/_Navigation.scss
@ -33,7 +33,7 @@
    a {
      &:hover {
        // text-decoration: underline; didn't quite match comps.
-        border-bottom: 1px solid $blue-40;
+        border-bottom: 1px solid var(--newtab-link-primary-color);

        &:active {
          border-bottom: 1px solid $blue-70;
--- a/browser/components/newtab/content-src/components/TopSites/TopSite.jsx
+++ b/browser/components/newtab/content-src/components/TopSites/TopSite.jsx
@ -6,7 +6,6 @@ import {
  TOP_SITES_SEARCH_SHORTCUTS_CONTEXT_MENU_OPTIONS,
  TOP_SITES_SOURCE,
 } from "./TopSitesConstants";
-import {injectIntl} from "react-intl";
 import {LinkMenu} from "content-src/components/LinkMenu/LinkMenu";
 import React from "react";
 import {ScreenshotUtils} from "content-src/lib/screenshot-utils";
@ -284,7 +283,7 @@ export class TopSite extends React.PureComponent {
          <button aria-haspopup="true"
            className="context-menu-button icon"
            data-l10n-id="newtab-menu-content-tooltip"
-            data-l10n-args={`{ "title": "${title}" }`}
+            data-l10n-args={JSON.stringify({title})}
            onClick={this.onMenuButtonClick} />
          {isContextMenuOpen &&
            <LinkMenu
@ -325,7 +324,7 @@ export class TopSitePlaceholder extends React.PureComponent {
  }
 }

-export class _TopSiteList extends React.PureComponent {
+export class TopSiteList extends React.PureComponent {
  static get DEFAULT_STATE() {
    return {
      activeIndex: null,
@ -338,7 +337,7 @@ export class _TopSiteList extends React.PureComponent {

  constructor(props) {
    super(props);
-    this.state = _TopSiteList.DEFAULT_STATE;
+    this.state = TopSiteList.DEFAULT_STATE;
    this.onDragEvent = this.onDragEvent.bind(this);
    this.onActivate = this.onActivate.bind(this);
  }
@ -351,7 +350,7 @@ export class _TopSiteList extends React.PureComponent {
        prevTopSites[this.state.draggedIndex].url === this.state.draggedSite.url &&
        (!newTopSites[this.state.draggedIndex] || newTopSites[this.state.draggedIndex].url !== this.state.draggedSite.url)) {
        // We got the new order from the redux store via props. We can clear state now.
-        this.setState(_TopSiteList.DEFAULT_STATE);
+        this.setState(TopSiteList.DEFAULT_STATE);
      }
    }
  }
@ -379,7 +378,7 @@ export class _TopSiteList extends React.PureComponent {
      case "dragend":
        if (!this.dropped) {
          // If there was no drop event, reset the state to the default.
-          this.setState(_TopSiteList.DEFAULT_STATE);
+          this.setState(TopSiteList.DEFAULT_STATE);
        }
        break;
      case "dragenter":
@ -472,7 +471,6 @@ export class _TopSiteList extends React.PureComponent {
    const commonProps = {
      onDragEvent: this.onDragEvent,
      dispatch: props.dispatch,
-      intl: props.intl,
    };
    // We assign a key to each placeholder slot. We need it to be independent
    // of the slot index (i below) so that the keys used stay the same during
@ -511,5 +509,3 @@ export class _TopSiteList extends React.PureComponent {
    </ul>);
  }
 }
-
-export const TopSiteList = injectIntl(_TopSiteList);
--- a/browser/components/newtab/content-src/components/TopSites/TopSites.jsx
+++ b/browser/components/newtab/content-src/components/TopSites/TopSites.jsx
@ -135,7 +135,7 @@ export class _TopSites extends React.PureComponent {
        isFirst={props.isFirst}
        isLast={props.isLast}
        dispatch={props.dispatch}>
-        <TopSiteList TopSites={props.TopSites} TopSitesRows={props.TopSitesRows} dispatch={props.dispatch} intl={props.intl} topSiteIconType={topSiteIconType} />
+        <TopSiteList TopSites={props.TopSites} TopSitesRows={props.TopSitesRows} dispatch={props.dispatch} topSiteIconType={topSiteIconType} />
        <div className="edit-topsites-wrapper">
          {editForm &&
            <div className="edit-topsites">
@ -144,7 +144,6 @@ export class _TopSites extends React.PureComponent {
                  site={props.TopSites.rows[editForm.index]}
                  onClose={this.onEditFormClose}
                  dispatch={this.props.dispatch}
-                  intl={this.props.intl}
                  {...editForm} />
              </ModalOverlayWrapper>
            </div>
--- a/browser/components/newtab/css/activity-stream-linux.css
+++ b/browser/components/newtab/css/activity-stream-linux.css
@ -2453,7 +2453,7 @@ main {
    .ds-navigation ul li:last-child::after {
      content: none; }
    .ds-navigation ul li a:hover {
-      border-bottom: 1px solid #45A1FF; }
+      border-bottom: 1px solid var(--newtab-link-primary-color); }
      .ds-navigation ul li a:hover:active {
        border-bottom: 1px solid #003EAA; }
    .ds-navigation ul li a:active {
--- a/browser/components/newtab/css/activity-stream-mac.css
+++ b/browser/components/newtab/css/activity-stream-mac.css
@ -2456,7 +2456,7 @@ main {
    .ds-navigation ul li:last-child::after {
      content: none; }
    .ds-navigation ul li a:hover {
-      border-bottom: 1px solid #45A1FF; }
+      border-bottom: 1px solid var(--newtab-link-primary-color); }
      .ds-navigation ul li a:hover:active {
        border-bottom: 1px solid #003EAA; }
    .ds-navigation ul li a:active {
--- a/browser/components/newtab/css/activity-stream-windows.css
+++ b/browser/components/newtab/css/activity-stream-windows.css
@ -2453,7 +2453,7 @@ main {
    .ds-navigation ul li:last-child::after {
      content: none; }
    .ds-navigation ul li a:hover {
-      border-bottom: 1px solid #45A1FF; }
+      border-bottom: 1px solid var(--newtab-link-primary-color); }
      .ds-navigation ul li a:hover:active {
        border-bottom: 1px solid #003EAA; }
    .ds-navigation ul li a:active {
--- a/browser/components/newtab/data/content/activity-stream.bundle.js
+++ b/browser/components/newtab/data/content/activity-stream.bundle.js
--- a/browser/components/newtab/docs/v2-system-addon/unit_testing_guide.md
+++ b/browser/components/newtab/docs/v2-system-addon/unit_testing_guide.md
@ -146,8 +146,3 @@ const {mount} = require("enzyme");
 ...
 const wrapper = mount(<Foo />);
 ```
-
-### Rendering localized components
-
-If you need to render a component that contains localized components, use the
-`shallowWithIntl` and `mountWithIntl` functions in `system-addon/test/unit/utils`.
--- a/browser/components/newtab/karma.mc.config.js
+++ b/browser/components/newtab/karma.mc.config.js
@ -94,7 +94,7 @@ module.exports = function(config) {
            },
            "content-src/components/**/*.jsx": {
              statements: 51.1,
-              lines: 53.6,
+              lines: 52.38,
              functions: 31.2,
              branches: 31.2,
            },
--- a/browser/components/newtab/lib/ASRouter.jsm
+++ b/browser/components/newtab/lib/ASRouter.jsm
@ -1310,7 +1310,7 @@ class _ASRouter {

    // Clear and refresh Attribution, and then fetch the messages again to update
    AttributionCode._clearCache();
-    AttributionCode.getAttrDataAsync();
+    await AttributionCode.getAttrDataAsync();
    this._updateMessageProviders();
    await this.loadMessagesFromAllProviders();
  }
--- a/browser/components/newtab/lib/AboutPreferences.jsm
+++ b/browser/components/newtab/lib/AboutPreferences.jsm
@ -152,7 +152,6 @@ this.AboutPreferences = class AboutPreferences {
    const getString = message =>
      typeof message !== "object" ? message : message.id;

-    
    // Helper to link a UI element to a preference for updating
    const linkPref = (element, name, type) => {
      const fullPref = `browser.newtabpage.activity-stream.${name}`;
@ -176,7 +175,7 @@ this.AboutPreferences = class AboutPreferences {
    const homeHeader = createAppend("label", contentsGroup)
      .appendChild(document.createElementNS(HTML_NS, "h2"));
    document.l10n.setAttributes(homeHeader, "home-prefs-content-header");
-    
+
    const homeDescription = createAppend("description", contentsGroup);
    document.l10n.setAttributes(homeDescription, "home-prefs-content-description");

--- a/browser/components/newtab/lib/ActivityStream.jsm
+++ b/browser/components/newtab/lib/ActivityStream.jsm
@ -221,6 +221,7 @@ const PREFS_CONFIG = new Map([
  ["discoverystream.config", {
    title: "Configuration for the new pocket new tab",
    getValue: ({geo, locale}) => {
+      // XXX hardcoded_layout only works for en-*, so fix before adding locales
      const locales = ({
        "US": ["en-CA", "en-GB", "en-US", "en-ZA"],
        "CA": ["en-CA", "en-GB", "en-US", "en-ZA"],
--- a/browser/components/newtab/lib/DownloadsManager.jsm
+++ b/browser/components/newtab/lib/DownloadsManager.jsm
@ -8,6 +8,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
  DownloadsCommon: "resource:///modules/DownloadsCommon.jsm",
  DownloadsViewUI: "resource:///modules/DownloadsViewUI.jsm",
  FileUtils: "resource://gre/modules/FileUtils.jsm",
+  NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
 });

 const DOWNLOAD_CHANGED_DELAY_TIME = 1000; // time in ms to delay timer for downloads changed events
@ -82,6 +83,14 @@ this.DownloadsManager = class DownloadsManager {
                      .sort((download1, download2) => download1.endTime < download2.endTime);

    for (const download of downloads) {
+      // Ignore blocked links, but allow long (data:) uris to avoid high CPU
+      if (
+        download.source.url.length < 10000 &&
+        NewTabUtils.blockedLinks.isBlocked(download.source)
+      ) {
+        continue;
+      }
+
      // Only include downloads where the file still exists
      if (onlyExists) {
        // Refresh download to ensure the 'exists' attribute is up to date
--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
@ -2,44 +2,12 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
+/* globals Localization */
 const {FxAccountsConfig} = ChromeUtils.import("resource://gre/modules/FxAccountsConfig.jsm");
 const {AttributionCode} = ChromeUtils.import("resource:///modules/AttributionCode.jsm");
 const {AddonRepository} = ChromeUtils.import("resource://gre/modules/addons/AddonRepository.jsm");
 const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");

-async function getAddonInfo() {
-  try {
-    let {content, source} = await AttributionCode.getAttrDataAsync();
-    if (!content || source !== "addons.mozilla.org") {
-      return null;
-    }
-    // Attribution data can be double encoded
-    while (content.includes("%")) {
-      try {
-        const result = decodeURIComponent(content);
-        if (result === content) {
-          break;
-        }
-        content = result;
-      } catch (e) {
-        break;
-      }
-    }
-    const [addon] = await AddonRepository.getAddonsByIDs([content]);
-    if (addon.sourceURI.scheme !== "https") {
-      return null;
-    }
-    return {
-      name: addon.name,
-      url: addon.sourceURI.spec,
-      iconURL: addon.icons["64"] || addon.icons["32"],
-    };
-  } catch (e) {
-    Cu.reportError("Failed to get the latest add-on version for Return to AMO");
-    return null;
-  }
-}
-
 const L10N = new Localization([
  "branding/brand.ftl",
  "browser/branding/brandings.ftl",
@ -182,20 +150,20 @@ const ONBOARDING_MESSAGES = async () => ([
    utm_term: "trailhead-sync",
    content: {
      className: "syncCohort",
-      title: {property_id: "firstrun_title"},
-      subtitle: {property_id: "firstrun_content"},
+      title: {string_id: "onboarding-sync-welcome-header"},
+      subtitle: {string_id: "onboarding-sync-welcome-content"},
      benefits: [],
      learn: {
-        text: {property_id: "firstrun_learn_more_link"},
+        text: {string_id: "onboarding-sync-welcome-learn-more-link"},
        url: "https://www.mozilla.org/firefox/accounts/",
      },
      form: {
-        title: {property_id: "firstrun_form_header"},
-        text: {property_id: "firstrun_form_sub_header"},
-        email: {property_id: "firstrun_email_input_placeholder"},
-        button: {property_id: "firstrun_continue_to_login"},
+        title: {string_id: "onboarding-sync-form-header"},
+        text: {string_id: "onboarding-sync-form-sub-header"},
+        email: {string_id: "onboarding-sync-form-input"},
+        button: {string_id: "onboarding-sync-form-continue-button"},
      },
-      skipButton: {property_id: "firstrun_skip_login"},
+      skipButton: {string_id: "onboarding-sync-form-skip-login-button"},
    },
  },
  {
@ -475,7 +443,7 @@ const OnboardingMessageProvider = {
      // that, and update the message accordingly
      if (msg.template === "return_to_amo_overlay") {
        try {
-          const {name, iconURL, url} = await getAddonInfo();
+          const {name, iconURL, url} = await this.getAddonInfo();
          // If we do not have all the data from the AMO api to indicate to the user
          // what they are installing we don't want to show the message
          if (!name || !iconURL || !url) {
@ -513,6 +481,38 @@ const OnboardingMessageProvider = {
    }
    return translatedMessages;
  },
+  async getAddonInfo() {
+    try {
+      let {content, source} = await AttributionCode.getAttrDataAsync();
+      if (!content || source !== "addons.mozilla.org") {
+        return null;
+      }
+      // Attribution data can be double encoded
+      while (content.includes("%")) {
+        try {
+          const result = decodeURIComponent(content);
+          if (result === content) {
+            break;
+          }
+          content = result;
+        } catch (e) {
+          break;
+        }
+      }
+      const [addon] = await AddonRepository.getAddonsByIDs([content]);
+      if (addon.sourceURI.scheme !== "https") {
+        return null;
+      }
+      return {
+        name: addon.name,
+        url: addon.sourceURI.spec,
+        iconURL: addon.icons["64"] || addon.icons["32"],
+      };
+    } catch (e) {
+      Cu.reportError("Failed to get the latest add-on version for Return to AMO");
+      return null;
+    }
+  },
 };
 this.OnboardingMessageProvider = OnboardingMessageProvider;

--- a/browser/components/newtab/locales-src/en-US/strings.properties
+++ b/browser/components/newtab/locales-src/en-US/strings.properties
@ -1,23 +0,0 @@
-# LOCALIZATION NOTE (firstrun_*). These strings are displayed only once, on the
-# firstrun of the browser, they give an introduction to Firefox and Sync.
-firstrun_title=Take Firefox with You
-firstrun_content=Get your bookmarks, history, passwords and other settings on all your devices.
-firstrun_learn_more_link=Learn more about Firefox Accounts
-
-# LOCALIZATION NOTE (firstrun_form_header and firstrun_form_sub_header):
-# firstrun_form_sub_header is a continuation of firstrun_form_header, they are one sentence.
-# firstrun_form_header is displayed more boldly as the call to action.
-firstrun_form_header=Enter your email
-firstrun_form_sub_header=to continue to Firefox Sync
-
-firstrun_email_input_placeholder=Email
-firstrun_invalid_input=Valid email required
-
-# LOCALIZATION NOTE (firstrun_extra_legal_links): {terms} is equal to firstrun_terms_of_service, and
-# {privacy} is equal to firstrun_privacy_notice. {terms} and {privacy} are clickable links.
-firstrun_extra_legal_links=By proceeding, you agree to the {terms} and {privacy}.
-firstrun_terms_of_service=Terms of Service
-firstrun_privacy_notice=Privacy Notice
-
-firstrun_continue_to_login=Continue
-firstrun_skip_login=Skip this step
--- a/browser/components/newtab/locales-src/onboarding.ftl
+++ b/browser/components/newtab/locales-src/onboarding.ftl
@ -29,6 +29,29 @@ onboarding-join-form-legal = By proceeding, you agree to the <a data-l10n-name="
 onboarding-join-form-continue = Continue

 onboarding-start-browsing-button-label = Start Browsing
+onboarding-cards-dismiss =
+    .title = Dismiss
+    .aria-label = Dismiss
+
+## Firefox Sync modal dialog strings.
+
+onboarding-sync-welcome-header = Take { -brand-product-name } with You
+onboarding-sync-welcome-content = Get your bookmarks, history, passwords and other settings on all your devices.
+onboarding-sync-welcome-learn-more-link = Learn more about Firefox Accounts
+onboarding-sync-form-invalid-input = Valid email required
+onboarding-sync-legal-notice = By proceeding, you agree to the <a data-l10n-name="terms">Terms of Service</a> and <a data-l10n-name="privacy">Privacy Notice</a>.
+
+onboarding-sync-form-input =
+    .placeholder = Email
+
+onboarding-sync-form-continue-button = Continue
+onboarding-sync-form-skip-login-button = Skip this step
+
+## This is part of the line "Enter your email to continue to Firefox Sync"
+
+onboarding-sync-form-header = Enter your email
+onboarding-sync-form-sub-header = to continue to { -sync-brand-name }
+

 ## These are individual benefit messages shown with an image, title and
 ## description.
@ -116,6 +139,7 @@ onboarding-facebook-container-button = Add the Extension


 ## Message strings belonging to the Return to AMO flow
+
 return-to-amo-sub-header = Great, you’ve got { -brand-short-name }

 # <icon></icon> will be replaced with the icon belonging to the extension
--- a/browser/components/newtab/package.json
+++ b/browser/components/newtab/package.json
@ -135,14 +135,16 @@
    "tddmc": "karma start karma.mc.config.js --tdd",
    "debugcoverage": "open logs/coverage/index.html",
    "lint": "npm-run-all lint:*",
-    "lint:eslint-check": "eslint --print-config . | eslint-config-prettier-check",
-    "lint:eslint": "eslint --ext=.js,.jsm,.jsx .",
+    "lint:eslint-check": "eslint --cache --print-config . | eslint-config-prettier-check",
+    "lint:eslint": "eslint --cache --ext=.js,.jsm,.jsx .",
    "lint:sasslint": "sass-lint -v -q",
    "strings-import": "node ./bin/strings-import.js",
    "test": "npm run testmc",
    "tdd": "npm run tddmc",
    "vendor": "npm-run-all vendor:*",
    "vendor:react": "node ./bin/vendor-react.js",
+    "fix": "npm-run-all fix:*",
+    "fix:eslint": "npm run lint:eslint -- --fix",
    "help": "yamscripts help",
    "yamscripts": "yamscripts compile",
    "__": "# NOTE: THESE SCRIPTS ARE COMPILED!!! EDIT yamscripts.yml instead!!!"
--- a/browser/components/newtab/prerendered/locales/ach/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/ach/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="ach" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/ach/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/ach/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated ach file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Lami tam obedo {provider}",
-  "prefs_home_header": "Jami me Acakki Firefox",
-  "prefs_home_description": "Yer jami ma imito ii kio me Acakki Firefox.",
-  "prefs_content_discovery_description": "Content Discovery in Firefox Home allows you to discover high-quality, relevant articles from across the web.",
-  "prefs_section_rows_option": "{num} row;{num} rows",
-  "prefs_search_header": "Yeny me kakube",
-  "prefs_topsites_description": "Kakube ma ilimo loyo",
-  "prefs_topstories_description2": "Jami mabeco loyo ki ii kakube, kiyubo piri",
-  "prefs_topstories_options_sponsored_label": "Lok ma kicwako",
-  "prefs_topstories_sponsored_learn_more": "Nong ngec mapol",
-  "prefs_highlights_description": "Yer me kakube ma igwoko nyo ilimo",
-  "prefs_highlights_options_visited_label": "Potbuk ma kilimo",
-  "prefs_highlights_options_download_label": "Gam ma cokcoki loyo",
-  "prefs_highlights_options_pocket_label": "Kigwoko potbuk i Pocket",
-  "prefs_snippets_description": "Ngec manyen ki bot Mozilla ki Firefox",
-  "settings_pane_topsites_header": "Kakube ma gi loyo",
-  "settings_pane_highlights_header": "Wiye madito",
-  "settings_pane_highlights_options_bookmarks": "Alamabuk",
-  "settings_pane_snippets_header": "Kwena macek",
-  "pocket_how_it_works": "Kit ma tiyo kwede",
-  "firstrun_title": "Wot ki Firefox",
-  "firstrun_content": "Nong alamabuk mamegi, gin mukato, mung me donyo ki ter mukene i nyonyo ni weng.",
-  "firstrun_learn_more_link": "Nong ngec mapol ikom Akaunt me Firefox",
-  "firstrun_form_header": "Ket email mamegi",
-  "firstrun_form_sub_header": "to continue to Firefox Sync",
-  "firstrun_email_input_placeholder": "Email",
-  "firstrun_invalid_input": "Email ma tye atir mite",
-  "firstrun_extra_legal_links": "Mede anyim nyuto ni i yee {terms} ki {privacy}.",
-  "firstrun_terms_of_service": "Cik me Tic",
-  "firstrun_privacy_notice": "Ngec me mung",
-  "firstrun_continue_to_login": "Mede",
-  "firstrun_skip_login": "Kal citep man"
-};
--- a/browser/components/newtab/prerendered/locales/ach/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/ach/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="ach" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/ach/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/an/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/an/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="an" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/an/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/an/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated an file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Recomendau per {provider}",
-  "prefs_home_header": "Conteniu d'inicio de Firefox",
-  "prefs_home_description": "Tría qué contenisu quiers veyer en a tuya pachina d'inicio de Firefox.",
-  "prefs_content_discovery_description": "Content Discovery in Firefox Home allows you to discover high-quality, relevant articles from across the web.",
-  "prefs_section_rows_option": "{num} ringlera;{num} ringleras",
-  "prefs_search_header": "Busqueda web",
-  "prefs_topsites_description": "Los puestos que mas vesitas",
-  "prefs_topstories_description2": "Contenius interesants de tot lo web, personalizau pa tu",
-  "prefs_topstories_options_sponsored_label": "Articlos esponsorizaus",
-  "prefs_topstories_sponsored_learn_more": "Saber-ne mas",
-  "prefs_highlights_description": "Una tría d'os puestos que has alzau u vesitau",
-  "prefs_highlights_options_visited_label": "Pachinas visitadas",
-  "prefs_highlights_options_download_label": "Descarga mas recient",
-  "prefs_highlights_options_pocket_label": "Pachinas alzadas en Pocket",
-  "prefs_snippets_description": "Actualizacions de Mozilla y Firefox",
-  "settings_pane_topsites_header": "Puestos mas vesitaus",
-  "settings_pane_highlights_header": "Destacaus",
-  "settings_pane_highlights_options_bookmarks": "Marcapachinas",
-  "settings_pane_snippets_header": "Retallos",
-  "pocket_how_it_works": "How it works",
-  "firstrun_title": "Prene lo Firefox con tu",
-  "firstrun_content": "Obtiene los tuyos marcapachinas, historials, claus y atros achustes en totz los tuyos dispositivos.",
-  "firstrun_learn_more_link": "Aprende mas sobre las cuentas de Firefox",
-  "firstrun_form_header": "Escribe lo tuyo email",
-  "firstrun_form_sub_header": "pa continar enta Firefox Sync.",
-  "firstrun_email_input_placeholder": "Correu-e",
-  "firstrun_invalid_input": "Valid email required",
-  "firstrun_extra_legal_links": "Si contina, ye confirmando que ye d'acuerdo con as {terms} y {privacy}.",
-  "firstrun_terms_of_service": "Condicions d'uso",
-  "firstrun_privacy_notice": "Nota sobre privacidat",
-  "firstrun_continue_to_login": "Continar",
-  "firstrun_skip_login": "Blinca-te este paso"
-};
--- a/browser/components/newtab/prerendered/locales/an/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/an/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="an" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/an/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/ar/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/ar/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="ar" dir="rtl">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/ar/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/ar/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated ar file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "ينصح به {provider}",
-  "prefs_home_header": "محتوى فَيَرفُكس الرئيسي",
-  "prefs_home_description": "اختر المحتوى الذي تريد عرضه في شاشة بداية فَيَرفُكس.",
-  "prefs_content_discovery_description": "تتيح لك ميزة ”اكتشاف المحتوى“ في صفحة بداية فَيَرفُكس رؤية مقالات عالية الجودة لها علاقة بما تتابع، تأتيك من أرجاء الوِب.",
-  "prefs_section_rows_option": "صف واحد;صفان;{num} صفوف;{num} صفا;{num} صف;لا صفوف",
-  "prefs_search_header": "ابحث في الوِب",
-  "prefs_topsites_description": "أكثر المواقع المزارة",
-  "prefs_topstories_description2": "محتوى مميز من أرجاء الوِب انتقيناه لك أنت",
-  "prefs_topstories_options_sponsored_label": "الأخبار الممولة",
-  "prefs_topstories_sponsored_learn_more": "اطّلع على المزيد",
-  "prefs_highlights_description": "مجموعة المواقع التي حفظتها أو زرتها",
-  "prefs_highlights_options_visited_label": "الصفحات المزارة",
-  "prefs_highlights_options_download_label": "آخر ما نُزّل",
-  "prefs_highlights_options_pocket_label": "الصفحات المحفوظة في بوكِت",
-  "prefs_snippets_description": "التحديثات من موزيلا وفَيَرفُكس",
-  "settings_pane_topsites_header": "المواقع الأكثر زيارة",
-  "settings_pane_highlights_header": "أهم الأحداث",
-  "settings_pane_highlights_options_bookmarks": "العلامات",
-  "settings_pane_snippets_header": "المقتطفات",
-  "pocket_how_it_works": "آلية العمل",
-  "firstrun_title": "خذ معك فَيَرفُكس أينما ذهبت",
-  "firstrun_content": "تشارك العلامات، وتأريخ التصفح، وكلمات السر وباقي الإعدادات على جميع أجهزتك.",
-  "firstrun_learn_more_link": "اطّلع على المزيد عن حسابات فَيَرفُكس",
-  "firstrun_form_header": "أدخِل بريدك الإلكتروني",
-  "firstrun_form_sub_header": "لمواصلة استخدام «تزامُن فَيَرفُكس»",
-  "firstrun_email_input_placeholder": "البريد الإلكتروني",
-  "firstrun_invalid_input": "مطلوب بريد إلكتروني صالح",
-  "firstrun_extra_legal_links": "بمواصلة هذه العملية أنت توافق على {terms} و{privacy}.",
-  "firstrun_terms_of_service": "بنود الخدمة",
-  "firstrun_privacy_notice": "تنويه الخصوصية",
-  "firstrun_continue_to_login": "تابِع",
-  "firstrun_skip_login": "تجاوز هذه الخطوة"
-};
--- a/browser/components/newtab/prerendered/locales/ar/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/ar/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="ar" dir="rtl">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/ar/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/ast/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/ast/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="ast" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/ast/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/ast/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated ast file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Recomendáu por {provider}",
-  "prefs_home_header": "Firefox Home Content",
-  "prefs_home_description": "Choose what content you want on your Firefox Home screen.",
-  "prefs_content_discovery_description": "Content Discovery in Firefox Home allows you to discover high-quality, relevant articles from across the web.",
-  "prefs_section_rows_option": "{num} row;{num} rows",
-  "prefs_search_header": "Web Search",
-  "prefs_topsites_description": "The sites you visit most",
-  "prefs_topstories_description2": "Great content from around the web, personalized for you",
-  "prefs_topstories_options_sponsored_label": "Sponsored Stories",
-  "prefs_topstories_sponsored_learn_more": "Learn more",
-  "prefs_highlights_description": "A selection of sites that you’ve saved or visited",
-  "prefs_highlights_options_visited_label": "Visited Pages",
-  "prefs_highlights_options_download_label": "Most Recent Download",
-  "prefs_highlights_options_pocket_label": "Pages Saved to Pocket",
-  "prefs_snippets_description": "Updates from Mozilla and Firefox",
-  "settings_pane_topsites_header": "Más visitaos",
-  "settings_pane_highlights_header": "Destacaos",
-  "settings_pane_highlights_options_bookmarks": "Marcadores",
-  "settings_pane_snippets_header": "Retayos",
-  "pocket_how_it_works": "How it works",
-  "firstrun_title": "Take Firefox with You",
-  "firstrun_content": "Get your bookmarks, history, passwords and other settings on all your devices.",
-  "firstrun_learn_more_link": "Learn more about Firefox Accounts",
-  "firstrun_form_header": "Enter your email",
-  "firstrun_form_sub_header": "to continue to Firefox Sync",
-  "firstrun_email_input_placeholder": "Email",
-  "firstrun_invalid_input": "Valid email required",
-  "firstrun_extra_legal_links": "By proceeding, you agree to the {terms} and {privacy}.",
-  "firstrun_terms_of_service": "Terms of Service",
-  "firstrun_privacy_notice": "Privacy Notice",
-  "firstrun_continue_to_login": "Continue",
-  "firstrun_skip_login": "Skip this step"
-};
--- a/browser/components/newtab/prerendered/locales/ast/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/ast/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="ast" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/ast/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/az/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/az/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="az" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/az/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/az/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated az file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "{provider} məsləhət görür",
-  "prefs_home_header": "Firefox Ev Məzmunu",
-  "prefs_home_description": "Firefox Evdə hansı məzmunları görmək istədiyinizi seçin.",
-  "prefs_content_discovery_description": "Firefox Evdəki Məzmun Kəşfi yüksək keyfiyyətli və sizə uyğun internet məqalələrini kəşf etməyinizə imkan verir.",
-  "prefs_section_rows_option": "{num} sətir;{num} sətir",
-  "prefs_search_header": "Web Axtarış",
-  "prefs_topsites_description": "Ən çox ziyarət etdiyiniz saytlar",
-  "prefs_topstories_description2": "İnternetin ən yaxşı məzmunları, sizə görə fərdiləşdirilmiş",
-  "prefs_topstories_options_sponsored_label": "Sponsorlaşdırılmış Hekayələr",
-  "prefs_topstories_sponsored_learn_more": "Ətraflı öyrən",
-  "prefs_highlights_description": "Saxladığınız və ya ziyarət etdiyiniz saytlardan seçmələr",
-  "prefs_highlights_options_visited_label": "Baxılmış Səhifələr",
-  "prefs_highlights_options_download_label": "Son Endirmələr",
-  "prefs_highlights_options_pocket_label": "Pocket-ə Saxlanılan Səhifələr",
-  "prefs_snippets_description": "Mozilla və Firefoxdan yeniliklər",
-  "settings_pane_topsites_header": "Qabaqcıl Saytlar",
-  "settings_pane_highlights_header": "Seçilmişlər",
-  "settings_pane_highlights_options_bookmarks": "Əlfəcinlər",
-  "settings_pane_snippets_header": "Hissələr",
-  "pocket_how_it_works": "Bu necə işləyir",
-  "firstrun_title": "Firefox-u özünüzlə gəzdirin",
-  "firstrun_content": "Əlfəcin, tarixçə, parol və digər tənzimləmələrinizi bütün cihazlarınızda əldə edin.",
-  "firstrun_learn_more_link": "Firefox Hesabları haqqında ətraflı öyrənin",
-  "firstrun_form_header": "E-poçtunuzu daxil edin",
-  "firstrun_form_sub_header": "və Firefox Sync ilə davam edin.",
-  "firstrun_email_input_placeholder": "E-poçt",
-  "firstrun_invalid_input": "Doğru e-poçt tələb olunur",
-  "firstrun_extra_legal_links": "Davam etməklə {terms} və {privacy} ilə razılaşmış olursuz.",
-  "firstrun_terms_of_service": "İstifadə Şərtləri",
-  "firstrun_privacy_notice": "Məxfilik Bildirişi",
-  "firstrun_continue_to_login": "Davam et",
-  "firstrun_skip_login": "Bu addımı keç"
-};
--- a/browser/components/newtab/prerendered/locales/az/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/az/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="az" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/az/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/be/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/be/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="be" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/be/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/be/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated be file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Рэкамендавана {provider}",
-  "prefs_home_header": "Хатні экран Firefox",
-  "prefs_home_description": "Выберыце пажаданае змесціва для хатняга экрана Firefox.",
-  "prefs_content_discovery_description": "Выяўленне змесціва на хатняй старонцы Firefox дазволіць вам знаходзіць высакаякасныя рэлевантныя артыкулы з усяго сеціва.",
-  "prefs_section_rows_option": "{num} радок;{num} радкі;{num} радкоў",
-  "prefs_search_header": "Пошук у сеціве",
-  "prefs_topsites_description": "Сайты, якія вы наведваеце найчасцей",
-  "prefs_topstories_description2": "Выдатнае змесціва з усяго інтэрнэту, выбранае спецыяльна для вас",
-  "prefs_topstories_options_sponsored_label": "Артыкулы ад спонсараў",
-  "prefs_topstories_sponsored_learn_more": "Даведацца больш",
-  "prefs_highlights_description": "Выбраныя сайты, якія вы захавалі ці наведалі",
-  "prefs_highlights_options_visited_label": "Наведаныя старонкі",
-  "prefs_highlights_options_download_label": "Нядаўнія сцягванні",
-  "prefs_highlights_options_pocket_label": "Захаваныя ў Pocket старонкі",
-  "prefs_snippets_description": "Абнаўленні ад Mozilla і Firefox",
-  "settings_pane_topsites_header": "Папулярныя сайты",
-  "settings_pane_highlights_header": "Выбранае",
-  "settings_pane_highlights_options_bookmarks": "Закладкі",
-  "settings_pane_snippets_header": "Урыўкі",
-  "pocket_how_it_works": "Як гэта працуе",
-  "firstrun_title": "Вазьміце Firefox з сабой",
-  "firstrun_content": "Атрымайце доступ да вашых закладак, гісторыі, пароляў і іншых налад на ўсіх вашых прыладах.",
-  "firstrun_learn_more_link": "Даведайцеся больш пра ўліковыя запісы Firefox",
-  "firstrun_form_header": "Увядзіце сваю электронную пошту",
-  "firstrun_form_sub_header": "каб прадоўжыць з Firefox Sync.",
-  "firstrun_email_input_placeholder": "Эл.пошта",
-  "firstrun_invalid_input": "Патрабуецца сапраўдны адрас эл.пошты",
-  "firstrun_extra_legal_links": "Працягваючы, вы згаджаецеся з {terms} і {privacy}.",
-  "firstrun_terms_of_service": "умовамі абслугоўвання",
-  "firstrun_privacy_notice": "паведамленнем аб прыватнасці",
-  "firstrun_continue_to_login": "Працягнуць",
-  "firstrun_skip_login": "Прапусціць гэты крок"
-};
--- a/browser/components/newtab/prerendered/locales/be/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/be/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="be" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/be/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/bg/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/bg/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="bg" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/bg/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/bg/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated bg file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Препоръчано от {provider}",
-  "prefs_home_header": "Начална страница на Firefox",
-  "prefs_home_description": "Изберете съдържанието, което искате да виждате на началната страница на Firefox.",
-  "prefs_content_discovery_description": "Content Discovery in Firefox Home allows you to discover high-quality, relevant articles from across the web.",
-  "prefs_section_rows_option": "{num} ред;{num} реда",
-  "prefs_search_header": "Търсене в Мрежата",
-  "prefs_topsites_description": "Най-посещаваните от вас страници",
-  "prefs_topstories_description2": "Отлично съдържание от цялата Мрежа, подбрано лично за вас",
-  "prefs_topstories_options_sponsored_label": "Платени публикации",
-  "prefs_topstories_sponsored_learn_more": "Научете повече",
-  "prefs_highlights_description": "Избрани страници, които сте запазили или посетили",
-  "prefs_highlights_options_visited_label": "Посетени страници",
-  "prefs_highlights_options_download_label": "Последни изтегляния",
-  "prefs_highlights_options_pocket_label": "Страници, запазени в Pocket",
-  "prefs_snippets_description": "Новости от Mozilla и Firefox",
-  "settings_pane_topsites_header": "Често посещавани страници",
-  "settings_pane_highlights_header": "Акценти",
-  "settings_pane_highlights_options_bookmarks": "Отметки",
-  "settings_pane_snippets_header": "Изрезки",
-  "pocket_how_it_works": "Как работи",
-  "firstrun_title": "Вземете Firefox с вас",
-  "firstrun_content": "Вземете своите отметки, история, пароли и всички други настройки на всички ваши устройства.",
-  "firstrun_learn_more_link": "Научете повече за Firefox Accounts",
-  "firstrun_form_header": "Въведете своята ел. поща,",
-  "firstrun_form_sub_header": "за да продължите към Firefox Sync",
-  "firstrun_email_input_placeholder": "адрес на електронна поща",
-  "firstrun_invalid_input": "Необходим е валиден адрес на ел. поща",
-  "firstrun_extra_legal_links": "Продължавайки, вие се съгласявате с {terms} и {privacy}.",
-  "firstrun_terms_of_service": "условията на услугата",
-  "firstrun_privacy_notice": "политиката за лични данни",
-  "firstrun_continue_to_login": "Продължаване",
-  "firstrun_skip_login": "Пропускане"
-};
--- a/browser/components/newtab/prerendered/locales/bg/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/bg/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="bg" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/bg/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/bn/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/bn/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="bn" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/bn/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/bn/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated bn file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "{provider} দ্বারা সুপারিশকৃত",
-  "prefs_home_header": "Firefox Home কনটেন্ট",
-  "prefs_home_description": "আপনার Firefox Home স্ক্রিনে যেসব কনটেন্ট রাখতে চান তা পছন্দ করুন।",
-  "prefs_content_discovery_description": "Content Discovery in Firefox Home allows you to discover high-quality, relevant articles from across the web.",
-  "prefs_section_rows_option": "{num} সারি; {num} সারিগুলি",
-  "prefs_search_header": "ওয়েব অনুসন্ধান",
-  "prefs_topsites_description": "যে সাইটগুলিতে আপনি বেশি যান",
-  "prefs_topstories_description2": "ওয়েবের দারুন সব কন্টেন্ট, নিজের মত করে সাঁজিয়ে নিন",
-  "prefs_topstories_options_sponsored_label": "স্পন্সর করা স্টোরি",
-  "prefs_topstories_sponsored_learn_more": "আরও জানুন",
-  "prefs_highlights_description": "সাইটের একটি সেকশন যা আপনি সংরক্ষণ অথবা গিয়েছিলেন",
-  "prefs_highlights_options_visited_label": "ঘুরে আসা পেজ",
-  "prefs_highlights_options_download_label": "সর্বশেষ ডাউনলোড",
-  "prefs_highlights_options_pocket_label": "পেজটি Pocket এ সংরক্ষণ করা হয়েছে",
-  "prefs_snippets_description": "Mozilla and Firefox থেকে হালনাগাদ",
-  "settings_pane_topsites_header": "শীর্ষ সাইট",
-  "settings_pane_highlights_header": "হাইলাইটস",
-  "settings_pane_highlights_options_bookmarks": "বুকমার্ক",
-  "settings_pane_snippets_header": "টুকিটাকি",
-  "pocket_how_it_works": "কিভাবে এটা কাজ করে",
-  "firstrun_title": "অাপনি Firefox ব্যবহার করুন",
-  "firstrun_content": "আপনার সমস্ত ডিভাইসে আপনার বুকমার্ক, ইতিহাস, পাসওয়ার্ড এবং অন্যান্য সেটিংস পাওয়া যাবে।",
-  "firstrun_learn_more_link": "Firefox অ্যাকাউন্ট সম্পর্কে আরও জানুন",
-  "firstrun_form_header": "আপনার ই-মেইল লিখুন",
-  "firstrun_form_sub_header": "Firefox সিঙ্ক চালিয়ে যেতে",
-  "firstrun_email_input_placeholder": "ইমেইল",
-  "firstrun_invalid_input": "কার্যকর ইমেইল আবশ্যক",
-  "firstrun_extra_legal_links": "অগ্রসর হওয়ার মাধ্যমে আপনি {terms} এবং {privacy} এর সাথে সম্মত হচ্ছেন।",
-  "firstrun_terms_of_service": "সেবার শর্ত",
-  "firstrun_privacy_notice": "গোপনীয়তা নীতি",
-  "firstrun_continue_to_login": "চালিয়ে যান",
-  "firstrun_skip_login": "এই ধাপটি বাদ দিন"
-};
--- a/browser/components/newtab/prerendered/locales/bn/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/bn/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="bn" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/bn/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/br/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/br/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="br" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/br/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/br/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated br file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Erbedet gant {provider}",
-  "prefs_home_header": "Endalc'had Degemer Firefox",
-  "prefs_home_description": "Dibabit peseurt endalc'had a fell deoc'h kaout war ho skramm Firefox Degemer.",
-  "prefs_content_discovery_description": "Gant ann dizoloadenn endalc'hadoù e Firefox Home e c'hallit dizoloiñ pennadoù a berzhded uhel eus pep lec'h er web.",
-  "prefs_section_rows_option": "{num} renk;{num} renk;{num} renk;{num} a renkoù;{num} renk",
-  "prefs_search_header": "Klask web",
-  "prefs_topsites_description": "Al lec'hiennoù a weladennit ar muiañ",
-  "prefs_topstories_description2": "Danvez eus an dibab eus pep lec'h er web, personelaet evidoc'h",
-  "prefs_topstories_options_sponsored_label": "Istorioù kevelet",
-  "prefs_topstories_sponsored_learn_more": "Gouzout hiroc'h",
-  "prefs_highlights_description": "Un dibab a lec'hiennoù ho peus enrollet pe gweladennet",
-  "prefs_highlights_options_visited_label": "Pajennoù gweladennet",
-  "prefs_highlights_options_download_label": "Pellgargadurioù nevez",
-  "prefs_highlights_options_pocket_label": "Pajennoù enrollet e Pocket",
-  "prefs_snippets_description": "Keleier eus Mozilla ha Firefox",
-  "settings_pane_topsites_header": "Lec'hiennoù gwellañ",
-  "settings_pane_highlights_header": "Mareoù pouezus",
-  "settings_pane_highlights_options_bookmarks": "Sinedoù",
-  "settings_pane_snippets_header": "Notennigoù",
-  "pocket_how_it_works": "Penaos ez a en-dro",
-  "firstrun_title": "Kemerit Firefox ganeoc'h",
-  "firstrun_content": "Tizhit o sinedoù, roll-istor, gerioù-tremen hag arventennoù all war hon holl drevnadoù.",
-  "firstrun_learn_more_link": "Gouzout hiroc'h diwar-benn kontoù Firefox",
-  "firstrun_form_header": "Enankit ho chomlec'h postel",
-  "firstrun_form_sub_header": "evit kenderc'hel etrezek Firefox Sync.",
-  "firstrun_email_input_placeholder": "Postel",
-  "firstrun_invalid_input": "Postel talvoudek azgoulennet",
-  "firstrun_extra_legal_links": "En ur genderc'hel, e savit a-du gant an {terms} hag ar {privacy}.",
-  "firstrun_terms_of_service": "divizoù arver",
-  "firstrun_privacy_notice": "evezhiadennoù a-fet buhez prevez",
-  "firstrun_continue_to_login": "Kenderc'hel",
-  "firstrun_skip_login": "Tremen ar bazenn-mañ"
-};
--- a/browser/components/newtab/prerendered/locales/br/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/br/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="br" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/br/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/bs/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/bs/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="bs" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/bs/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/bs/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated bs file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Preporučeno od {provider}",
-  "prefs_home_header": "Firefox početni sadržaj",
-  "prefs_home_description": "Odaberite koji sadržaj želite na vašem početnom ekranu Firefoxa.",
-  "prefs_content_discovery_description": "Content Discovery in Firefox Home allows you to discover high-quality, relevant articles from across the web.",
-  "prefs_section_rows_option": "{num} red;{num} redovi",
-  "prefs_search_header": "Web pretraga",
-  "prefs_topsites_description": "Stranice koje najviše posjećujete",
-  "prefs_topstories_description2": "Sjajan sadržaj s cijelog weba, personalizovan za vas",
-  "prefs_topstories_options_sponsored_label": "Sponzorisane priče",
-  "prefs_topstories_sponsored_learn_more": "Saznajte više",
-  "prefs_highlights_description": "Izbor stranica koje ste sačuvali ili posjetili",
-  "prefs_highlights_options_visited_label": "Posjećene stranice",
-  "prefs_highlights_options_download_label": "Najnovija preuzimanja",
-  "prefs_highlights_options_pocket_label": "Stranice spremljene u Pocket",
-  "prefs_snippets_description": "Ažuriranja od Mozille i Firefoxa",
-  "settings_pane_topsites_header": "Najposjećenije stranice",
-  "settings_pane_highlights_header": "Istaknuto",
-  "settings_pane_highlights_options_bookmarks": "Zabilješke",
-  "settings_pane_snippets_header": "Isječci",
-  "pocket_how_it_works": "How it works",
-  "firstrun_title": "Take Firefox with You",
-  "firstrun_content": "Get your bookmarks, history, passwords and other settings on all your devices.",
-  "firstrun_learn_more_link": "Learn more about Firefox Accounts",
-  "firstrun_form_header": "Enter your email",
-  "firstrun_form_sub_header": "to continue to Firefox Sync",
-  "firstrun_email_input_placeholder": "Email",
-  "firstrun_invalid_input": "Valid email required",
-  "firstrun_extra_legal_links": "By proceeding, you agree to the {terms} and {privacy}.",
-  "firstrun_terms_of_service": "Terms of Service",
-  "firstrun_privacy_notice": "Privacy Notice",
-  "firstrun_continue_to_login": "Continue",
-  "firstrun_skip_login": "Skip this step"
-};
--- a/browser/components/newtab/prerendered/locales/bs/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/bs/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="bs" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/bs/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/ca/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/ca/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="ca" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/ca/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/ca/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated ca file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Recomanat per {provider}",
-  "prefs_home_header": "Contingut d'inici del Firefox",
-  "prefs_home_description": "Trieu el contingut que voleu a la pantalla d'inici del Firefox.",
-  "prefs_content_discovery_description": "El descobriment de contingut en la pàgina d'inici del Firefox us permet descobrir articles de gran qualitat i rellevants de tot el web.",
-  "prefs_section_rows_option": "{num} fila;{num} files",
-  "prefs_search_header": "Cerca web",
-  "prefs_topsites_description": "Els llocs que visiteu més sovint",
-  "prefs_topstories_description2": "El contingut més interessant de tot el web, personalitzat per a vós",
-  "prefs_topstories_options_sponsored_label": "Articles patrocinats",
-  "prefs_topstories_sponsored_learn_more": "Més informació",
-  "prefs_highlights_description": "Una selecció dels llocs que heu desat o visitat",
-  "prefs_highlights_options_visited_label": "Pàgines visitades",
-  "prefs_highlights_options_download_label": "Baixada més recent",
-  "prefs_highlights_options_pocket_label": "Pàgines desades al Pocket",
-  "prefs_snippets_description": "Actualitzacions de Mozilla i del Firefox",
-  "settings_pane_topsites_header": "Llocs principals",
-  "settings_pane_highlights_header": "Destacats",
-  "settings_pane_highlights_options_bookmarks": "Adreces d'interès",
-  "settings_pane_snippets_header": "Retalls",
-  "pocket_how_it_works": "Com funciona",
-  "firstrun_title": "El vostre Firefox, a tot arreu",
-  "firstrun_content": "Accediu a les vostres adreces d'interès, historial, contrasenyes i preferències en tots els vostres dispositius.",
-  "firstrun_learn_more_link": "Més informació sobre el Compte del Firefox",
-  "firstrun_form_header": "Introduïu la vostra adreça electrònica",
-  "firstrun_form_sub_header": "per continuar al Firefox Sync.",
-  "firstrun_email_input_placeholder": "Adreça electrònica",
-  "firstrun_invalid_input": "Cal una adreça electrònica vàlida",
-  "firstrun_extra_legal_links": "Si continueu, accepteu les {terms} i l'{privacy}.",
-  "firstrun_terms_of_service": "Condicions del servei",
-  "firstrun_privacy_notice": "Avís de privadesa",
-  "firstrun_continue_to_login": "Continua",
-  "firstrun_skip_login": "Omet aquest pas"
-};
--- a/browser/components/newtab/prerendered/locales/ca/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/ca/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="ca" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/ca/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/cak/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/cak/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="cak" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/cak/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/cak/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated cak file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Chilab'en ruma {provider}",
-  "prefs_home_header": "Etamab'äl pa ri Rutikirib'al Firefox",
-  "prefs_home_description": "Tacha' achike etamab'äl nawajo' pa ri Rutikirib'al Firefox ruwäch.",
-  "prefs_content_discovery_description": "Content Discovery pa Rutikirib'al Firefox nuya' q'ij chawe richin ye'awïl nima'q taq cholna'oj ri nïm kejqalem pa ronojel ajk'amaya'l.",
-  "prefs_section_rows_option": "{num} cholaj;{num} taq cholaj",
-  "prefs_search_header": "Ajk'amaya'l Kanoxïk",
-  "prefs_topsites_description": "Taq ruxaq yalan ye'atz'ët",
-  "prefs_topstories_description2": "Nïm rupam chijun ri ajk'amaya'l, ichinan awuma rat",
-  "prefs_topstories_options_sponsored_label": "To'on taq B'anob'äl",
-  "prefs_topstories_sponsored_learn_more": "Tetamäx ch'aqa' chik",
-  "prefs_highlights_description": "Jun rucha'onem ruxaq, ri xayäk o xatz'ët",
-  "prefs_highlights_options_visited_label": "Taq Ruxaq Etz'eton",
-  "prefs_highlights_options_download_label": "K'a B'a' Keqasäx",
-  "prefs_highlights_options_pocket_label": "Taq Ruxaq Eyakon pa Pocket",
-  "prefs_snippets_description": "Kik'exoj Mozilla chuqa' Firefox",
-  "settings_pane_topsites_header": "Jeb'ël Taq Ruxaq",
-  "settings_pane_highlights_header": "Ya'on kiq'ij",
-  "settings_pane_highlights_options_bookmarks": "Yaketal",
-  "settings_pane_snippets_header": "Taq pir",
-  "pocket_how_it_works": "Achike rub'eyal nisamäj",
-  "firstrun_title": "Tak'waj ri Firefox Awik'in",
-  "firstrun_content": "Ke'ak'waj ri taq yaketal, natab'äl, ewan taq tzij chuqa' ch'aqa' chik taq nuk'ulem pa ronojel taq awokisaxel.",
-  "firstrun_learn_more_link": "Tawetamaj ch'aqa' chik pa ruwi' ri Firefox Taqoya'l",
-  "firstrun_form_header": "Tatz'ib'aj ri ataqoya'l",
-  "firstrun_form_sub_header": "richin yatok pa Firefox Sync.",
-  "firstrun_email_input_placeholder": "Taqoya'l",
-  "firstrun_invalid_input": "Najowäx ütz chi taqoya'l",
-  "firstrun_extra_legal_links": "Toq nasamajij qa, nawojqaj ri {terms} chuqa' {privacy}.",
-  "firstrun_terms_of_service": "Kojqanem Samaj",
-  "firstrun_privacy_notice": "Ichinan Na'oj",
-  "firstrun_continue_to_login": "Titikïr chik el",
-  "firstrun_skip_login": "Tixakalüx re jun ruxak re'"
-};
--- a/browser/components/newtab/prerendered/locales/cak/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/cak/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="cak" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/cak/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/crh/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/crh/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="crh" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/crh/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/crh/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated crh file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "{provider} tevsiyeli",
-  "prefs_home_header": "Firefox Ev Muhtevası",
-  "prefs_home_description": "Firefox Ev saifesinde körmege istegeniñiz muhtevanı saylañız.",
-  "prefs_content_discovery_description": "Content Discovery in Firefox Home allows you to discover high-quality, relevant articles from across the web.",
-  "prefs_section_rows_option": "{num} satır;{num} satır",
-  "prefs_search_header": "Ağ Qıdırması",
-  "prefs_topsites_description": "En çoq ziyaret etkeniñiz saytlar",
-  "prefs_topstories_description2": "İnternet etrafından mükemmel muhteva, siziñ içün şahsiyleştirilgen",
-  "prefs_topstories_options_sponsored_label": "Sponsorlı Hikâyeler",
-  "prefs_topstories_sponsored_learn_more": "Daha çoq ögren",
-  "prefs_highlights_description": "Saqlağan yaki ziyaret etken olğanıñız saytlarnıñ bir saylamı",
-  "prefs_highlights_options_visited_label": "Ziyaret etilgen saifeler",
-  "prefs_highlights_options_download_label": "Eñ Deminki Endirme",
-  "prefs_highlights_options_pocket_label": "Pocket’ke Saqlanğan Saifeler",
-  "prefs_snippets_description": "Mozilla ve Firefox’tan Yañartmalar",
-  "settings_pane_topsites_header": "Eñ Üst Saytlar",
-  "settings_pane_highlights_header": "Yüksek-ışıtmalar",
-  "settings_pane_highlights_options_bookmarks": "Saifeimleri",
-  "settings_pane_snippets_header": "Qırpıntılar",
-  "pocket_how_it_works": "How it works",
-  "firstrun_title": "Take Firefox with You",
-  "firstrun_content": "Get your bookmarks, history, passwords and other settings on all your devices.",
-  "firstrun_learn_more_link": "Learn more about Firefox Accounts",
-  "firstrun_form_header": "Enter your email",
-  "firstrun_form_sub_header": "to continue to Firefox Sync",
-  "firstrun_email_input_placeholder": "Email",
-  "firstrun_invalid_input": "Valid email required",
-  "firstrun_extra_legal_links": "By proceeding, you agree to the {terms} and {privacy}.",
-  "firstrun_terms_of_service": "Terms of Service",
-  "firstrun_privacy_notice": "Privacy Notice",
-  "firstrun_continue_to_login": "Continue",
-  "firstrun_skip_login": "Skip this step"
-};
--- a/browser/components/newtab/prerendered/locales/crh/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/crh/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="crh" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/crh/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/cs/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/cs/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="cs" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/cs/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/cs/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated cs file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Doporučení ze služby {provider}",
-  "prefs_home_header": "Obsah domovské stránky Firefoxu",
-  "prefs_home_description": "Vyberte obsah, který chcete mít na výchozí domovské stránce Firefoxu.",
-  "prefs_content_discovery_description": "Doporučování obsahu na domovské stránce obsahu vám nabídne kvalitní a relevantní články z celého internetu.",
-  "prefs_section_rows_option": "{num} řádek;{num} řádky;{num} řádků",
-  "prefs_search_header": "Vyhledávání na webu",
-  "prefs_topsites_description": "Nejnavštěvovanější stránky",
-  "prefs_topstories_description2": "Skvělý obsah z celého webu, vybraný speciálně pro vás",
-  "prefs_topstories_options_sponsored_label": "Sponzorované články",
-  "prefs_topstories_sponsored_learn_more": "Zjistit více",
-  "prefs_highlights_description": "Výběr z uložených nebo navštívených stránek",
-  "prefs_highlights_options_visited_label": "Navštívené stránky",
-  "prefs_highlights_options_download_label": "Nedávná stahování",
-  "prefs_highlights_options_pocket_label": "Stránky uložené do služby Pocket",
-  "prefs_snippets_description": "Aktuální informace od Mozilly a Firefoxu",
-  "settings_pane_topsites_header": "Top stránky",
-  "settings_pane_highlights_header": "Vybrané",
-  "settings_pane_highlights_options_bookmarks": "Záložky",
-  "settings_pane_snippets_header": "Útržky",
-  "pocket_how_it_works": "Jak to funguje",
-  "firstrun_title": "Vezměte si Firefox s sebou",
-  "firstrun_content": "Mějte své záložky, historii i uložená hesla s sebou na všech svých zařízeních.",
-  "firstrun_learn_more_link": "Zjistit více o účtech Firefoxu",
-  "firstrun_form_header": "Zadejte svoji e-mailovou adresu",
-  "firstrun_form_sub_header": "a používejte službu Firefox Sync.",
-  "firstrun_email_input_placeholder": "E-mail",
-  "firstrun_invalid_input": "Je požadován platný e-mail",
-  "firstrun_extra_legal_links": "Pokračováním souhlasíte s {terms} a {privacy}.",
-  "firstrun_terms_of_service": "Podmínkami používání služby",
-  "firstrun_privacy_notice": "Zásadami ochrany osobních údajů",
-  "firstrun_continue_to_login": "Pokračovat",
-  "firstrun_skip_login": "Přeskočit tento krok"
-};
--- a/browser/components/newtab/prerendered/locales/cs/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/cs/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="cs" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/cs/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/cy/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/cy/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="cy" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/cy/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/cy/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated cy file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Argymhellwyd gan {provider}",
-  "prefs_home_header": "Cynnwys Cartref Firefox",
-  "prefs_home_description": "Dewis pa gynnwys rydych eisiau ar eich sgrin Firefox Cartref.",
-  "prefs_content_discovery_description": "Mae Darganfod Cynnwys yng Nghartref Firefox yn caniatáu i chi ddarganfod erthyglau perthnasol o ansawdd uchel ar draws y we.",
-  "prefs_section_rows_option": "{num} rhes;{num} rhes;{num} rhes;{num} rhes;{num} rhes;{num} rhes",
-  "prefs_search_header": "Chwilio'r We",
-  "prefs_topsites_description": "Y gwefannau rydych yn ymweld â nhw amlaf",
-  "prefs_topstories_description2": "Cynnwys gwych o ar draws y we, wedi ei ddewis yn arbennig i chi",
-  "prefs_topstories_options_sponsored_label": "Straeon wedi eu Noddi",
-  "prefs_topstories_sponsored_learn_more": "Dysgu rhagor",
-  "prefs_highlights_description": "Detholiad o wefannau rydych wedi eu cadw neu ymweld â nhw",
-  "prefs_highlights_options_visited_label": "Tudalennau Ymwelwyd â Nhw",
-  "prefs_highlights_options_download_label": "Llwytho i Lawr Mwyaf Diweddar",
-  "prefs_highlights_options_pocket_label": "Tudalennau wedi eu Cadw i Pocket",
-  "prefs_snippets_description": "Diweddariadau gan Mozilla a Firefox",
-  "settings_pane_topsites_header": "Hoff Wefannau",
-  "settings_pane_highlights_header": "Goreuon",
-  "settings_pane_highlights_options_bookmarks": "Nodau Tudalen",
-  "settings_pane_snippets_header": "Tameidiau",
-  "pocket_how_it_works": "Sut mae'n gweithio",
-  "firstrun_title": "Mynd â Firefox gyda Chi",
-  "firstrun_content": "Cael eich nodau tudalen, hanes, cyfrineiriau a gosodiadau eraill ar eich holl ddyfeisiau.",
-  "firstrun_learn_more_link": "Dysgu rhagor am Gyfrif Firefox",
-  "firstrun_form_header": "Rhowch eich e-bost",
-  "firstrun_form_sub_header": "ac ymlaen i Firefox Sync",
-  "firstrun_email_input_placeholder": "E-bost",
-  "firstrun_invalid_input": "Mae angen e-bost dilys",
-  "firstrun_extra_legal_links": "Gan barhau, rydych yn cytuno i delerau'r {terms} a'r {privacy}.",
-  "firstrun_terms_of_service": "Amodau Gwasanaeth",
-  "firstrun_privacy_notice": "Hysbysiad Preifatrwydd",
-  "firstrun_continue_to_login": "Parhau",
-  "firstrun_skip_login": "Hepgor y cam hwn"
-};
--- a/browser/components/newtab/prerendered/locales/cy/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/cy/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="cy" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/cy/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/da/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/da/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="da" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/da/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/da/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated da file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Anbefalet af {provider}",
-  "prefs_home_header": "Indhold på Firefox' startside",
-  "prefs_home_description": "Vælg det indhold, du vil have vist på din startside i Firefox.",
-  "prefs_content_discovery_description": "Funktionen Opdag indhold på Firefox' startside viser dig relevante artikler af høj kvalitet fra nettet.",
-  "prefs_section_rows_option": "{num} række;{num} rækker",
-  "prefs_search_header": "Søgning på internettet",
-  "prefs_topsites_description": "Mest besøgte websider",
-  "prefs_topstories_description2": "Spændende indhold fra nettet, specielt udvalgt til dig",
-  "prefs_topstories_options_sponsored_label": "Sponsorerede historier",
-  "prefs_topstories_sponsored_learn_more": "Læs mere",
-  "prefs_highlights_description": "Et afsnit med sider, du har gemt eller besøgt",
-  "prefs_highlights_options_visited_label": "Besøgte sider",
-  "prefs_highlights_options_download_label": "Seneste filhentninger",
-  "prefs_highlights_options_pocket_label": "Sider gemt til Pocket",
-  "prefs_snippets_description": "Nyheder fra Mozilla og Firefox",
-  "settings_pane_topsites_header": "Mest besøgte websider",
-  "settings_pane_highlights_header": "Fremhævede",
-  "settings_pane_highlights_options_bookmarks": "Bogmærker",
-  "settings_pane_snippets_header": "Notitser",
-  "pocket_how_it_works": "Sådan virker det",
-  "firstrun_title": "Tag Firefox med dig",
-  "firstrun_content": "Få adgang til din historik, dine bogmærker, adgangskoder og andre indstillinger på alle dine enheder.",
-  "firstrun_learn_more_link": "Læs mere om Firefox-konti",
-  "firstrun_form_header": "Indtast din mailadresse",
-  "firstrun_form_sub_header": "for at fortsætte til Firefox Sync.",
-  "firstrun_email_input_placeholder": "Mailadresse",
-  "firstrun_invalid_input": "En gyldig mailadresse er påkrævet",
-  "firstrun_extra_legal_links": "Ved at fortsætte accepterer du vores {terms} og vores {privacy}.",
-  "firstrun_terms_of_service": "tjenestevilkår",
-  "firstrun_privacy_notice": "privatlivspolitik",
-  "firstrun_continue_to_login": "Fortsæt",
-  "firstrun_skip_login": "Spring dette trin over"
-};
--- a/browser/components/newtab/prerendered/locales/da/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/da/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="da" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/da/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/de/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/de/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="de" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/de/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/de/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated de file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Empfohlen von {provider}",
-  "prefs_home_header": "Inhalte des Firefox-Startbildschirms",
-  "prefs_home_description": "Wählen Sie, welche Inhalte auf Ihrem Firefox-Startbildschirm angezeigt werden sollen.",
-  "prefs_content_discovery_description": "\"Neues aus dem Netz\" macht auf gute Inhalte im Internet aufmerksam.",
-  "prefs_section_rows_option": "{num} Zeile;{num} Zeilen",
-  "prefs_search_header": "Internetsuche",
-  "prefs_topsites_description": "Die von die Ihnen am meisten besuchten Websites",
-  "prefs_topstories_description2": "Tolle Inhalte aus dem ganzen Internet, für Sie personalisiert",
-  "prefs_topstories_options_sponsored_label": "Gesponserte Inhalte",
-  "prefs_topstories_sponsored_learn_more": "Weitere Informationen",
-  "prefs_highlights_description": "Eine Auswahl von Websites, die Sie gespeichert oder besucht haben",
-  "prefs_highlights_options_visited_label": "Besuchte Seiten",
-  "prefs_highlights_options_download_label": "Neueste Downloads",
-  "prefs_highlights_options_pocket_label": "Bei Pocket gespeicherte Seiten",
-  "prefs_snippets_description": "Neuigkeiten von Mozilla und Firefox",
-  "settings_pane_topsites_header": "Wichtige Seiten",
-  "settings_pane_highlights_header": "Überblick",
-  "settings_pane_highlights_options_bookmarks": "Lesezeichen",
-  "settings_pane_snippets_header": "Kurzinformationen",
-  "pocket_how_it_works": "Wie es funktioniert",
-  "firstrun_title": "Firefox für unterwegs",
-  "firstrun_content": "Nimm Lesezeichen, Chronik, Passwörter und andere Einstellungen mit auf alle deine Geräten.",
-  "firstrun_learn_more_link": "Weitere Infos zum Firefox-Konto",
-  "firstrun_form_header": "E-Mail-Adresse eingeben",
-  "firstrun_form_sub_header": "um dich bei Firefox Sync anzumelden",
-  "firstrun_email_input_placeholder": "E-Mail",
-  "firstrun_invalid_input": "Gültige E-Mail-Adresse erforderlich",
-  "firstrun_extra_legal_links": "Indem du fortfährst, stimmst du unseren {terms} und dem {privacy} zu.",
-  "firstrun_terms_of_service": "Nutzungsbedingungen",
-  "firstrun_privacy_notice": "Datenschutzhinweis",
-  "firstrun_continue_to_login": "Weiter",
-  "firstrun_skip_login": "Diesen Schritt überspringen"
-};
--- a/browser/components/newtab/prerendered/locales/de/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/de/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="de" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/de/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/dsb/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/dsb/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="dsb" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/dsb/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/dsb/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated dsb file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Wót {provider} dopórucony",
-  "prefs_home_header": "Wopśimjeśe startowego boka Firefox",
-  "prefs_home_description": "Wubjeŕśo, kótare wopśimjeśe cośo na swójej startowej wobrazowce Firefox měś.",
-  "prefs_content_discovery_description": "Content Discovery na startowem boku Firefox wam zmóžnja, w interneśe relewantne nastawki wusokeje kwality namakaś.",
-  "prefs_section_rows_option": "{num} smužka;{num} smužce;{num}smužki;{num} smužkow",
-  "prefs_search_header": "Webpytanje",
-  "prefs_topsites_description": "Sedła, ku kótarymž se nejcesćej woglědujośo",
-  "prefs_topstories_description2": "Wjelicne wopśimjeśe z cełego weba, wubrane specielnje za was",
-  "prefs_topstories_options_sponsored_label": "Sponsorowane tšojenja pokazaś",
-  "prefs_topstories_sponsored_learn_more": "Dalšne informacije",
-  "prefs_highlights_description": "Wuběrk websedłow, kótarež sćo składował abo se woglědał",
-  "prefs_highlights_options_visited_label": "Woglědane boki",
-  "prefs_highlights_options_download_label": "Nejnowše ześěgnjenje",
-  "prefs_highlights_options_pocket_label": "Boki skłaźone do Pocket",
-  "prefs_snippets_description": "Aktualizacije wót Mozilla a Firefox",
-  "settings_pane_topsites_header": "Nejcesćej woglědane sedła",
-  "settings_pane_highlights_header": "Wjerški",
-  "settings_pane_highlights_options_bookmarks": "Cytańske znamjenja",
-  "settings_pane_snippets_header": "Kuski",
-  "pocket_how_it_works": "Kak funkcioněrujo",
-  "firstrun_title": "Wzejśo Firefox sobu",
-  "firstrun_content": "Wzejśo swóje cytańske znamjenja, historiju, gronidła a druge nastajenja na wšych wašych rědach sobu.",
-  "firstrun_learn_more_link": "Zgóńśo wěcej wó Firefox Accounts",
-  "firstrun_form_header": "Zapódajśo swóju e-mailowu adresu",
-  "firstrun_form_sub_header": "aby z Firefox Sync pókšacował.",
-  "firstrun_email_input_placeholder": "E-mail",
-  "firstrun_invalid_input": "Płaśiwa e-mailowa adresa trěbna",
-  "firstrun_extra_legal_links": "Gaž pókšacujośo, zwolijośo do {terms} a {privacy}.",
-  "firstrun_terms_of_service": "Wužywańske wuměnjenja",
-  "firstrun_privacy_notice": "Powěźeńka priwatnosći",
-  "firstrun_continue_to_login": "Dalej",
-  "firstrun_skip_login": "Toś ten kšac pśeskócyś"
-};
--- a/browser/components/newtab/prerendered/locales/dsb/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/dsb/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="dsb" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/dsb/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/el/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/el/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="el" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/el/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/el/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated el file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Προτεινόμενο από τον πάροχο {provider}",
-  "prefs_home_header": "Περιεχόμενο αρχικής σελίδας Firefox",
-  "prefs_home_description": "Επιλέξτε τι περιεχόμενο θέλετε στην αρχική σελίδα του Firefox σας.",
-  "prefs_content_discovery_description": "Η ανακάλυψη περιεχομένου στην Αρχική Firefox σάς επιτρέπει να ανακαλύψετε υψηλής ποιότητας, σχετικά άρθρα από όλο τον ιστό.",
-  "prefs_section_rows_option": "{num} σειρά;{num} σειρές",
-  "prefs_search_header": "Διαδικτυακή αναζήτηση",
-  "prefs_topsites_description": "Οι ιστοσελίδες που επισκέπτεστε περισσότερο",
-  "prefs_topstories_description2": "Εξαιρετικό περιεχόμενο από το διαδίκτυο, εξατομικευμένο για εσάς",
-  "prefs_topstories_options_sponsored_label": "Χορηγούμενες ιστορίες",
-  "prefs_topstories_sponsored_learn_more": "Μάθετε περισσότερα",
-  "prefs_highlights_description": "Μια συλλογή ιστοσελίδων που έχετε αποθηκεύσει ή επισκεφθεί",
-  "prefs_highlights_options_visited_label": "Σελίδες που έχετε επισκεφθεί",
-  "prefs_highlights_options_download_label": "Πιο πρόσφατες λήψεις",
-  "prefs_highlights_options_pocket_label": "Αποθηκευμένες σελίδες του Pocket",
-  "prefs_snippets_description": "Ενημερώσεις από τη Mozilla και το Firefox",
-  "settings_pane_topsites_header": "Κορυφαίες ιστοσελίδες",
-  "settings_pane_highlights_header": "Κορυφαίες στιγμές",
-  "settings_pane_highlights_options_bookmarks": "Σελιδοδείκτες",
-  "settings_pane_snippets_header": "Αποσπάσματα",
-  "pocket_how_it_works": "Πώς λειτουργεί",
-  "firstrun_title": "Πάρτε το Firefox μαζί σας",
-  "firstrun_content": "Κρατήστε τα αγαπημένα, το ιστορικό, τους κωδικούς πρόσβασης και άλλες ρυθμίσεις σας σε όλες σας τις συσκευές.",
-  "firstrun_learn_more_link": "Μάθετε περισσότερα για τους Λογαριασμούς Firefox",
-  "firstrun_form_header": "Εισάγετε το email σας",
-  "firstrun_form_sub_header": "για να συνεχίσετε στο Firefox Sync.",
-  "firstrun_email_input_placeholder": "Email",
-  "firstrun_invalid_input": "Απαιτείται έγκυρο email",
-  "firstrun_extra_legal_links": "Συνεχίζοντας, συμφωνείτε με τους {terms} και τη {privacy}.",
-  "firstrun_terms_of_service": "Όρους Υπηρεσίας",
-  "firstrun_privacy_notice": "Σημείωση Απορρήτου",
-  "firstrun_continue_to_login": "Συνέχεια",
-  "firstrun_skip_login": "Παράλειψη βήματος"
-};
--- a/browser/components/newtab/prerendered/locales/el/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/el/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="el" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/el/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/en-CA/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/en-CA/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="en-CA" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/en-CA/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/en-CA/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated en-CA file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Recommended by {provider}",
-  "prefs_home_header": "Firefox Home Content",
-  "prefs_home_description": "Choose what content you want on your Firefox Home screen.",
-  "prefs_content_discovery_description": "Content Discovery in Firefox Home allows you to discover high-quality, relevant articles from across the web.",
-  "prefs_section_rows_option": "{num} row;{num} rows",
-  "prefs_search_header": "Web Search",
-  "prefs_topsites_description": "The sites you visit most",
-  "prefs_topstories_description2": "Great content from around the web, personalized for you",
-  "prefs_topstories_options_sponsored_label": "Sponsored Stories",
-  "prefs_topstories_sponsored_learn_more": "Learn more",
-  "prefs_highlights_description": "A selection of sites that you’ve saved or visited",
-  "prefs_highlights_options_visited_label": "Visited Pages",
-  "prefs_highlights_options_download_label": "Most Recent Download",
-  "prefs_highlights_options_pocket_label": "Pages Saved to Pocket",
-  "prefs_snippets_description": "Updates from Mozilla and Firefox",
-  "settings_pane_topsites_header": "Top Sites",
-  "settings_pane_highlights_header": "Highlights",
-  "settings_pane_highlights_options_bookmarks": "Bookmarks",
-  "settings_pane_snippets_header": "Snippets",
-  "pocket_how_it_works": "How it works",
-  "firstrun_title": "Take Firefox with You",
-  "firstrun_content": "Get your bookmarks, history, passwords and other settings on all your devices.",
-  "firstrun_learn_more_link": "Learn more about Firefox Accounts",
-  "firstrun_form_header": "Enter your email",
-  "firstrun_form_sub_header": "to continue to Firefox Sync.",
-  "firstrun_email_input_placeholder": "Email",
-  "firstrun_invalid_input": "Valid email required",
-  "firstrun_extra_legal_links": "By proceeding, you agree to the {terms} and {privacy}.",
-  "firstrun_terms_of_service": "Terms of Service",
-  "firstrun_privacy_notice": "Privacy Notice",
-  "firstrun_continue_to_login": "Continue",
-  "firstrun_skip_login": "Skip this step"
-};
--- a/browser/components/newtab/prerendered/locales/en-CA/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/en-CA/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="en-CA" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/en-CA/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/en-GB/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/en-GB/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="en-GB" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/en-GB/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/en-GB/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated en-GB file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Recommended by {provider}",
-  "prefs_home_header": "Firefox Home Content",
-  "prefs_home_description": "Choose what content you want on your Firefox Home screen.",
-  "prefs_content_discovery_description": "Content Discovery in Firefox Home allows you to discover high-quality, relevant articles from across the web.",
-  "prefs_section_rows_option": "{num} row;{num} rows",
-  "prefs_search_header": "Web Search",
-  "prefs_topsites_description": "The sites you visit most",
-  "prefs_topstories_description2": "Great content from around the web, personalised for you",
-  "prefs_topstories_options_sponsored_label": "Sponsored Stories",
-  "prefs_topstories_sponsored_learn_more": "Learn more",
-  "prefs_highlights_description": "A selection of sites that you’ve saved or visited",
-  "prefs_highlights_options_visited_label": "Visited Pages",
-  "prefs_highlights_options_download_label": "Most Recent Download",
-  "prefs_highlights_options_pocket_label": "Pages Saved to Pocket",
-  "prefs_snippets_description": "Updates from Mozilla and Firefox",
-  "settings_pane_topsites_header": "Top Sites",
-  "settings_pane_highlights_header": "Highlights",
-  "settings_pane_highlights_options_bookmarks": "Bookmarks",
-  "settings_pane_snippets_header": "Snippets",
-  "pocket_how_it_works": "How it works",
-  "firstrun_title": "Take Firefox with You",
-  "firstrun_content": "Get your bookmarks, history, passwords and other settings on all your devices.",
-  "firstrun_learn_more_link": "Learn more about Firefox Accounts",
-  "firstrun_form_header": "Enter your email",
-  "firstrun_form_sub_header": "to continue to Firefox Sync",
-  "firstrun_email_input_placeholder": "Email",
-  "firstrun_invalid_input": "Valid email required",
-  "firstrun_extra_legal_links": "By proceeding, you agree to the {terms} and {privacy}.",
-  "firstrun_terms_of_service": "Terms of Service",
-  "firstrun_privacy_notice": "Privacy Notice",
-  "firstrun_continue_to_login": "Continue",
-  "firstrun_skip_login": "Skip this step"
-};
--- a/browser/components/newtab/prerendered/locales/en-GB/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/en-GB/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="en-GB" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/en-GB/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/en-US/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/en-US/activity-stream-strings.js
@ -1,35 +1,2 @@
 // Note - this is a generated en-US file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Recommended by {provider}",
-  "prefs_home_header": "Firefox Home Content",
-  "prefs_home_description": "Choose what content you want on your Firefox Home screen.",
-  "prefs_content_discovery_description": "Content Discovery in Firefox Home allows you to discover high-quality, relevant articles from across the web.",
-  "prefs_section_rows_option": "{num} row;{num} rows",
-  "prefs_search_header": "Web Search",
-  "prefs_topsites_description": "The sites you visit most",
-  "prefs_topstories_description2": "Great content from around the web, personalized for you",
-  "prefs_topstories_options_sponsored_label": "Sponsored Stories",
-  "prefs_topstories_sponsored_learn_more": "Learn more",
-  "prefs_highlights_description": "A selection of sites that you’ve saved or visited",
-  "prefs_highlights_options_visited_label": "Visited Pages",
-  "prefs_highlights_options_download_label": "Most Recent Download",
-  "prefs_highlights_options_pocket_label": "Pages Saved to Pocket",
-  "prefs_snippets_description": "Updates from Mozilla and Firefox",
-  "settings_pane_topsites_header": "Top Sites",
-  "settings_pane_highlights_header": "Highlights",
-  "settings_pane_highlights_options_bookmarks": "Bookmarks",
-  "settings_pane_snippets_header": "Snippets",
-  "pocket_how_it_works": "How it works",
-  "firstrun_title": "Take Firefox with You",
-  "firstrun_content": "Get your bookmarks, history, passwords and other settings on all your devices.",
-  "firstrun_learn_more_link": "Learn more about Firefox Accounts",
-  "firstrun_form_header": "Enter your email",
-  "firstrun_form_sub_header": "to continue to Firefox Sync",
-  "firstrun_email_input_placeholder": "Email",
-  "firstrun_invalid_input": "Valid email required",
-  "firstrun_extra_legal_links": "By proceeding, you agree to the {terms} and {privacy}.",
-  "firstrun_terms_of_service": "Terms of Service",
-  "firstrun_privacy_notice": "Privacy Notice",
-  "firstrun_continue_to_login": "Continue",
-  "firstrun_skip_login": "Skip this step"
-};
+window.gActivityStreamStrings = {};
--- a/browser/components/newtab/prerendered/locales/eo/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/eo/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="eo" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/eo/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/eo/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated eo file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Rekomendita de {provider}",
-  "prefs_home_header": "Enhavo de la hejmekrano de Firefox",
-  "prefs_home_description": "Elektu la enhavon, kiun vi volas en via hejmekrano de Firefox.",
-  "prefs_content_discovery_description": "Malkovro de enhavo en la eka paĝo de Firefox permesas al vi trovi altkvalitajn elstarajn artikolojn el la tuta teksaĵo.",
-  "prefs_section_rows_option": "{num} vico;{num} vicoj",
-  "prefs_search_header": "Serĉo en la reto",
-  "prefs_topsites_description": "Viaj plej vizititaj retejoj",
-  "prefs_topstories_description2": "Bonega enhavo de la tuta Teksaĵo, personecigita por vi",
-  "prefs_topstories_options_sponsored_label": "Patronitaj artikoloj",
-  "prefs_topstories_sponsored_learn_more": "Pli da informo",
-  "prefs_highlights_description": "Retejoj elektitaj inter tiuj, kiun vi vizitis aŭ konservis",
-  "prefs_highlights_options_visited_label": "Vizititaj paĝoj",
-  "prefs_highlights_options_download_label": "Lasta elŝuto",
-  "prefs_highlights_options_pocket_label": "Paĝoj konservitaj en Pocket",
-  "prefs_snippets_description": "Ĝisdatigoj de Mozilla kaj Firefox",
-  "settings_pane_topsites_header": "Plej vizitaj",
-  "settings_pane_highlights_header": "Elstaraĵoj",
-  "settings_pane_highlights_options_bookmarks": "Legosignoj",
-  "settings_pane_snippets_header": "Fragmentoj",
-  "pocket_how_it_works": "Kiel funkcias tio",
-  "firstrun_title": "Portu Firefox kun vi",
-  "firstrun_content": "Ricevu viajn legosignojn, historion, pasvortojn kaj aliajn agordojn en ĉiuj viaj aparatoj.",
-  "firstrun_learn_more_link": "Pli da informo pri la kontoj de Firefox",
-  "firstrun_form_header": "Tajpu vian retpoŝtan adreson",
-  "firstrun_form_sub_header": "por pluiri al Spegulado de Firefox.",
-  "firstrun_email_input_placeholder": "Retpoŝta adreso",
-  "firstrun_invalid_input": "Valida retpoŝta adreso postulata",
-  "firstrun_extra_legal_links": "Se vi daŭrigas vi akceptas la {terms} kaj {privacy}.",
-  "firstrun_terms_of_service": "kondiĉojn de uzo",
-  "firstrun_privacy_notice": "rimarkon pri privateco",
-  "firstrun_continue_to_login": "Daŭrigi",
-  "firstrun_skip_login": "Pretersalti tiun ĉi paŝon"
-};
--- a/browser/components/newtab/prerendered/locales/eo/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/eo/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="eo" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/eo/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/es-AR/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/locales/es-AR/activity-stream-noscripts.html
@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="es-AR" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-  </body>
-</html>
--- a/browser/components/newtab/prerendered/locales/es-AR/activity-stream-strings.js
+++ b/browser/components/newtab/prerendered/locales/es-AR/activity-stream-strings.js
@ -1,35 +0,0 @@
-// Note - this is a generated es-AR file.
-window.gActivityStreamStrings = {
-  "header_recommended_by": "Recomendado por {provider}",
-  "prefs_home_header": "Contenido de la página de inicio de Firefox",
-  "prefs_home_description": "Elija qué contenido desea en la Pantalla de inicio de Firefox.",
-  "prefs_content_discovery_description": "Content Discovery en la página de inicio de Firefox le permite descubrir artículos relevantes de alta calidad en toda la web.",
-  "prefs_section_rows_option": "fila de {num}; filas de {num}",
-  "prefs_search_header": "Búsqueda en la web",
-  "prefs_topsites_description": "Los sitios que más visita",
-  "prefs_topstories_description2": "El mejor contenido de toda la web, personalizado para usted",
-  "prefs_topstories_options_sponsored_label": "Historias patrocinadas",
-  "prefs_topstories_sponsored_learn_more": "Conocer más",
-  "prefs_highlights_description": "Una selección de sitios que guardó o visitó",
-  "prefs_highlights_options_visited_label": "Sitios visitados",
-  "prefs_highlights_options_download_label": "Descargado recientemente",
-  "prefs_highlights_options_pocket_label": "Páginas guardadas en Pocket",
-  "prefs_snippets_description": "Actualizaciones de Mozilla y Firefox",
-  "settings_pane_topsites_header": "Más visitados",
-  "settings_pane_highlights_header": "Destacados",
-  "settings_pane_highlights_options_bookmarks": "Marcadores",
-  "settings_pane_snippets_header": "Recortes",
-  "pocket_how_it_works": "Cómo funciona",
-  "firstrun_title": "Lleve Firefox con usted",
-  "firstrun_content": "Acceda a sus marcadores, historial, contraseñas y más ajustes en todos sus dispositivos.",
-  "firstrun_learn_more_link": "Descubra más sobre las Cuentas de Firefox",
-  "firstrun_form_header": "Ingrese su correo electrónico",
-  "firstrun_form_sub_header": "para pasar a Firefox Sync.",
-  "firstrun_email_input_placeholder": "Correo electrónico",
-  "firstrun_invalid_input": "Se requiere un correo electrónico válido",
-  "firstrun_extra_legal_links": "Al proceder, acepta los {terms} y {privacy}.",
-  "firstrun_terms_of_service": "Términos del servicio",
-  "firstrun_privacy_notice": "Nota de privacidad",
-  "firstrun_continue_to_login": "Continuar",
-  "firstrun_skip_login": "Saltear este paso"
-};
--- a/browser/components/newtab/prerendered/locales/es-AR/activity-stream.html
+++ b/browser/components/newtab/prerendered/locales/es-AR/activity-stream.html
@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="es-AR" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
-    <title data-l10n-id="newtab-page-title"></title>
-    <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
-    <link rel="localization" href="browser/branding/brandings.ftl" />
-    <link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
-    <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
-  </head>
-  <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
-    <div id="root"></div>
-    <div id="footer-asrouter-container" role="presentation"></div>
-    <script src="chrome://browser/content/contentSearchUI.js"></script>
-    <script src="chrome://browser/content/contentTheme.js"></script>
-    <script src="resource://activity-stream/vendor/react.js"></script>
-    <script src="resource://activity-stream/vendor/react-dom.js"></script>
-    <script src="resource://activity-stream/vendor/prop-types.js"></script>
-    <script src="resource://activity-stream/vendor/react-intl.js"></script>
-    <script src="resource://activity-stream/vendor/redux.js"></script>
-    <script src="resource://activity-stream/vendor/react-redux.js"></script>
-    <script src="resource://activity-stream/prerendered/es-AR/activity-stream-strings.js"></script>
-    <script src="resource://activity-stream/data/content/activity-stream.bundle.js"></script>
-  </body>
-</html>
--- a/Show More
+++ b/Show More