[tor-commits] [torbutton/maint-2.0] Bug 29035: Post-YE campaign clean-up 2018

gk Tue, 22 Jan 2019 08:31:01 -0800

commit fcbc57dc246ff38d7b04618ccab589c6cf33bad3
Author: Georg Koppen <[email protected]>
Date:   Fri Jan 18 09:14:52 2019 +0000


    Bug 29035: Post-YE campaign clean-up 2018
    
    Removing the donation banner.
---
 src/chrome/content/aboutTor/aboutTor-content.js |  30 ++-----
 src/chrome/content/aboutTor/aboutTor.xhtml      |  55 +++---------
 src/chrome/content/torbutton.js                 |  18 ++--
 src/chrome/locale/ar/aboutTor.dtd               |  19 ----
 src/chrome/locale/bn-BD/aboutTor.dtd            |  19 ----
 src/chrome/locale/ca/aboutTor.dtd               |  19 ----
 src/chrome/locale/cs/aboutTor.dtd               |  19 ----
 src/chrome/locale/da/aboutTor.dtd               |  19 ----
 src/chrome/locale/de/aboutTor.dtd               |  19 ----
 src/chrome/locale/el/aboutTor.dtd               |  19 ----
 src/chrome/locale/en-US/aboutTor.dtd            |  19 ----
 src/chrome/locale/es-AR/aboutTor.dtd            |  14 ---
 src/chrome/locale/es/aboutTor.dtd               |  19 ----
 src/chrome/locale/eu/aboutTor.dtd               |  19 ----
 src/chrome/locale/fa/aboutTor.dtd               |  19 ----
 src/chrome/locale/fr/aboutTor.dtd               |  19 ----
 src/chrome/locale/ga/aboutTor.dtd               |  19 ----
 src/chrome/locale/he/aboutTor.dtd               |  19 ----
 src/chrome/locale/hu/aboutTor.dtd               |  19 ----
 src/chrome/locale/id/aboutTor.dtd               |  19 ----
 src/chrome/locale/is/aboutTor.dtd               |  19 ----
 src/chrome/locale/it/aboutTor.dtd               |  19 ----
 src/chrome/locale/ja/aboutTor.dtd               |  19 ----
 src/chrome/locale/ka/aboutTor.dtd               |  19 ----
 src/chrome/locale/ko/aboutTor.dtd               |  19 ----
 src/chrome/locale/nb/aboutTor.dtd               |  19 ----
 src/chrome/locale/nl/aboutTor.dtd               |  19 ----
 src/chrome/locale/pl/aboutTor.dtd               |  19 ----
 src/chrome/locale/pt-BR/aboutTor.dtd            |  19 ----
 src/chrome/locale/ru/aboutTor.dtd               |  19 ----
 src/chrome/locale/sv/aboutTor.dtd               |  19 ----
 src/chrome/locale/tr/aboutTor.dtd               |  19 ----
 src/chrome/locale/vi/aboutTor.dtd               |  19 ----
 src/chrome/locale/zh-CN/aboutTor.dtd            |  19 ----
 src/chrome/locale/zh-TW/aboutTor.dtd            |  19 ----
 src/chrome/skin/aboutTor.css                    | 114 +++++++-----------------
 src/chrome/skin/donation_banner_image_3x.png    | Bin 71927 -> 0 bytes
 src/chrome/skin/newsletter_3x.png               | Bin 0 -> 6735 bytes
 src/defaults/preferences/preferences.js         |   2 +-
 39 files changed, 61 insertions(+), 761 deletions(-)

diff --git a/src/chrome/content/aboutTor/aboutTor-content.js 
b/src/chrome/content/aboutTor/aboutTor-content.js
index ccb9139d..ff5a970b 100644
--- a/src/chrome/content/aboutTor/aboutTor-content.js
+++ b/src/chrome/content/aboutTor/aboutTor-content.js
@@ -24,7 +24,7 @@ let { bindPrefAndInit, show_torbrowser_manual } = 
Cu.import("resource://torbutto
 var AboutTorListener = {
   kAboutTorLoadedMessage: "AboutTor:Loaded",
   kAboutTorChromeDataMessage: "AboutTor:ChromeData",
-  kAboutTorHideDonationBanner: "AboutTor:HideDonationBanner",
+  kAboutTorHideTorNewsBanner: "AboutTor:HideTorNewsBanner",
 
   get isAboutTor() {
     return content.document.documentURI.toLowerCase() == "about:tor";
@@ -61,24 +61,20 @@ var AboutTorListener = {
 
   setupBannerClosing: function () {
     let that = this;
-    let closer = content.document.getElementById("donation-banner-closer");
+    let closer = content.document.getElementById("tornews-banner-closer");
     closer.addEventListener("click", function () {
-      sendAsyncMessage(that.kAboutTorHideDonationBanner);
+      sendAsyncMessage(that.kAboutTorHideTorNewsBanner);
     });
-    let button = content.document.getElementById("donation-banner-button");
-    button.addEventListener("click", function () {
+    let link = content.document.querySelector("#tornews-banner-message a");
+    link.addEventListener("click", function () {
       // Wait until page unloads so we don't hide banner before that.
       content.addEventListener("unload", function () {
-        sendAsyncMessage(that.kAboutTorHideDonationBanner);
+        sendAsyncMessage(that.kAboutTorHideTorNewsBanner);
       });
     });
-    bindPrefAndInit("extensions.torbutton.donation_banner_countdown2",
-                    countdown => {
-                      if (content.document && content.document.body) {
-                        content.document.body.setAttribute(
-                          "show-donation-banner", countdown > 0);
-                      }
-                    });
+    bindPrefAndInit("extensions.torbutton.tornews_banner_countdown",
+                    countdown => content.document.body.setAttribute(
+                      "show-tornews-banner", countdown > 0));
   },
 
   onPageLoad: function() {
@@ -128,14 +124,6 @@ var AboutTorListener = {
     content.document.getElementById("manualLink").href =
                             "https://tb-manual.torproject.org/"; + aLocale;
 
-    // Don't use "Count Me In" phrase in non-en-US locales
-    if (!aLocale.startsWith("en")) {
-      let button = content.document.getElementById("donation-banner-button");
-      button.innerHTML = button.getAttribute("data-0");
-      let theURL = button.getAttribute("href");
-      button.setAttribute("href", theURL.slice(0,-2));
-    }
-
     // Display the Tor Browser product name and version.
     try {
       const kBrandBundle = "chrome://branding/locale/brand.properties";
diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml 
b/src/chrome/content/aboutTor/aboutTor.xhtml
index 52fab695..87fe8307 100644
--- a/src/chrome/content/aboutTor/aboutTor.xhtml
+++ b/src/chrome/content/aboutTor/aboutTor.xhtml
@@ -31,54 +31,21 @@ window.addEventListener("pageshow", function() {
 </script>
 </head>
 <body dir="&locale.dir;">
-  <div id="donation-banner">
-    <div id="donation-banner-image"></div>
-    <div id="donation-banner-lines">
-      <div id="donation-banner-line1">&aboutTor.donationBanner.line1;</div>
-      <div id="donation-banner-line2"
-           data-6="&aboutTor.donationBanner.line2e;"
-           data-7="&aboutTor.donationBanner.line2f;"
-           data-8="&aboutTor.donationBanner.line2g;"
-           data-9="&aboutTor.donationBanner.line2h;"
-           data-10="&aboutTor.donationBanner.line2i;"
-           data-11="&aboutTor.donationBanner.line2j;">
-        &aboutTor.donationBanner.line2e;
+  <div id="tornews-banner">
+    <div><!--EMPTY SPACER DIV--></div>
+    <div id="tornews-banner-message">
+      <div id="tornews-banner-icon"></div>
+      <div>&aboutTor.newsletter.tagline;
+        <a href="https://newsletter.torproject.org";>
+          &aboutTor.newsletter.link_text;
+        </a>
       </div>
-      <div id="donation-banner-line3"
-           data-b="&aboutTor.donationBanner.line3b;">
-        &aboutTor.donationBanner.line3;</div>
-      <a id="donation-banner-button"
-         href="https://www.torproject.org/donate/donate-sin-tbd0-0";
-         type="button"
-         data-0="&aboutTor.donationBanner.buttonA;"
-         data-1="&aboutTor.donationBanner.buttonB;">
-        &aboutTor.donationBanner.buttonA;
-      </a>
     </div>
-    <div id="donation-banner-closer">&times;</div>
+    <div id="tornews-banner-closer">&times;</div>
   </div>
-<script type="text/javascript">
- <![CDATA[
-    let lineChoice = 6 + Math.floor(Math.random() * 6);
-    let line2 = document.getElementById("donation-banner-line2");
-    let line2text = line2.getAttribute(`data-${lineChoice}`);
-    let line2pieces = line2text.split(" ");
-    let line2end = '<span>' + line2pieces.pop() + '</span>';
-    line2pieces.push(line2end);
-    line2.innerHTML = line2pieces.join(" ");
-    line3 = document.getElementById("donation-banner-line3");
-    if (lineChoice === 11) {
-      line3.innerHTML = line3.getAttribute("data-b");
-    }
-    let buttonChoice = Math.floor(Math.random() * 2);
-    let button = document.getElementById("donation-banner-button");
-    button.innerHTML = button.getAttribute(`data-${buttonChoice}`);
-    button.setAttribute("href",
-      
`https://www.torproject.org/donate/donate-sin-tbd${lineChoice}-${buttonChoice}`);
-]]>
-</script>
-  <div id="torstatus-version"/>
+
   <div class="torcontent-container">
+    <div id="torstatus-version"/>
     <div id="torstatus" class="top">
       <div id="torstatus-on-container" class="hideIfTorOff 
torstatus-container">
         <div class="heading1">&aboutTor.ready.label;</div>
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 864d1d2e..03dc3563 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -19,7 +19,7 @@ const k_tb_last_browser_version_pref = 
"extensions.torbutton.lastBrowserVersion"
 const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded";
 const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck";
 const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed";
-const k_tb_donation_banner_countdown = 
"extensions.torbutton.donation_banner_countdown2";
+const k_tb_tornews_banner_countdown = 
"extensions.torbutton.tornews_banner_countdown";
 
 var m_tb_prefs = Services.prefs;
 
@@ -233,10 +233,10 @@ function torbutton_init_toolbutton()
 }
 
 // Show the Sign Up for Tor News banner a finite number of times.
-function torbutton_donation_banner_countdown() {
-  let count = m_tb_prefs.getIntPref(k_tb_donation_banner_countdown, 0);
+function torbutton_tornews_banner_countdown() {
+  let count = m_tb_prefs.getIntPref(k_tb_tornews_banner_countdown, 0);
   if (count > 0) {
-    m_tb_prefs.setIntPref(k_tb_donation_banner_countdown, count - 1);
+    m_tb_prefs.setIntPref(k_tb_tornews_banner_countdown, count - 1);
   }
 }
 
@@ -348,10 +348,10 @@ function torbutton_init() {
     // Add about:tor IPC message listener.
     window.messageManager.addMessageListener("AboutTor:Loaded",
                                    torbutton_abouttor_message_handler);
-    window.messageManager.addMessageListener("AboutTor:HideDonationBanner",
+    window.messageManager.addMessageListener("AboutTor:HideTorNewsBanner",
                                    torbutton_abouttor_message_handler);
 
-    torbutton_donation_banner_countdown();
+    torbutton_tornews_banner_countdown();
 
     setupPreferencesForMobile();
 
@@ -431,9 +431,9 @@ var torbutton_abouttor_message_handler = {
         aMessage.target.messageManager.sendAsyncMessage("AboutTor:ChromeData",
                                                         this.chromeData);
         break;
-      case "AboutTor:HideDonationBanner":
-        torbutton_log(5, "message AboutTor:HideDonationBanner received");
-        m_tb_prefs.setIntPref(k_tb_donation_banner_countdown, 0);
+      case "AboutTor:HideTorNewsBanner":
+        torbutton_log(5, "message AboutTor:HideTorNewsBanner received");
+        m_tb_prefs.setIntPref(k_tb_tornews_banner_countdown, 0);
         break;
     }
   },
diff --git a/src/chrome/locale/ar/aboutTor.dtd 
b/src/chrome/locale/ar/aboutTor.dtd
index 7fda4740..878d860e 100644
--- a/src/chrome/locale/ar/aboutTor.dtd
+++ b/src/chrome/locale/ar/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "Ø§ØØµÙ Ø¹ÙÙ Ø¢Ø®Ø± Ø£Ø®Ø¨Ø§Ø± ØªÙØ± 
ÙØ¨Ø§Ø´Ø±Ø© Ø¹ÙÙ Ø¨Ø±ÙØ¯Ù">
 <!ENTITY aboutTor.newsletter.link_text "Ø§Ø´ØªØ±Ù ÙÙØØµÙÙ Ø¹ÙÙ 
Ø£Ø®Ø¨Ø§Ø± ØªÙØ±.">
-
-<!ENTITY aboutTor.donationBanner.line1 "ØªÙØ±: ÙÙØ§Ø· Ø§ÙÙÙØ©">
-
-<!ENTITY aboutTor.donationBanner.line2a "Ø§ÙÙØ¬ÙÙÙÙØ© ØªØØªØ§Ø¬ 
ÙØµØØ¨Ø©.">
-<!ENTITY aboutTor.donationBanner.line2b "Ø³Ø§Ø¹Ø¯ ÙÙ ØªÙØ¯Ù ØÙÙÙ 
Ø§ÙØ¥ÙØ³Ø§Ù.">
-<!ENTITY aboutTor.donationBanner.line2c "Ø§ÙØªØµØ± ÙÙØØ±ÙØ©.">
-<!ENTITY aboutTor.donationBanner.line2d "Ø§ØÙ Ø®ØµÙØµÙØ© Ø§ÙÙ
ÙØ§ÙÙÙ.">
-<!ENTITY aboutTor.donationBanner.line2e "ØØ§ÙØ¸ Ø¹ÙÙ ÙÙØ© ØªÙØ±.">
-<!ENTITY aboutTor.donationBanner.line2f "ÙØØªØ§Ø¬ Ø¯Ø¹ÙÙ.">
-<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
-<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
-<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation 
until 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "ØªØ¨Ø±Ø¹ Ø§ÙÙÙÙØ ÙØ³ØªØ¬Ø§Ø±ÙÙ 
ÙÙØ²ÙÙØ§ ÙØªØ¨Ø±Ø¹ Ø¨ÙÙØ³ Ø§ÙÙØ¨ÙØº.">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice 
as strong.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "ØªØ¨Ø±Ø¹ Ø§ÙØ¢Ù">
-<!ENTITY aboutTor.donationBanner.buttonB "Ø³Ø£Ø´Ø§Ø±Ù">
diff --git a/src/chrome/locale/bn-BD/aboutTor.dtd 
b/src/chrome/locale/bn-BD/aboutTor.dtd
index fdac71be..0896f075 100644
--- a/src/chrome/locale/bn-BD/aboutTor.dtd
+++ b/src/chrome/locale/bn-BD/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "à¦à¦° à¦¥à§à¦à§ 
à¦¸à¦°à§à¦¬à¦¶à§à¦· à¦à¦¬à¦° à¦¨à¦¿à¦¨ à¦¸à§à¦à¦¾ à¦à¦ªà¦¨à¦¾à¦° 
à¦à¦¨à¦¬à¦à§à¦¸à§ à¥¤">
 <!ENTITY aboutTor.newsletter.link_text "à¦à¦° à¦¨à¦¿à¦à¦-à¦à¦° 
à¦à¦¨à§à¦¯ à¦¸à¦¾à¦à¦¨ à¦à¦ª à¦à¦°à§à¦¨ à¥¤">
-
-<!ENTITY aboutTor.donationBanner.line1 "à¦à¦°: à¦¸à¦à¦à§à¦¯à¦¾à¦ 
à¦¶à¦à§à¦¤à¦¿">
-
-<!ENTITY aboutTor.donationBanner.line2a "à¦à¦¦à§à¦®à¦¨à¦¾à¦® à¦¬à§à¦¶à§ 
à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦à¦¾à¦°à§à¦° à¦®à¦§à§à¦¯à§ 
à¦à¦¾à¦°à§à¦¯à¦à¦°à§à¥¤">
-<!ENTITY aboutTor.donationBanner.line2b "à¦¸à¦¾à¦°à§à¦¬à¦à¦¨à§à¦¨ 
à¦®à¦¾à¦¨à¦¬à¦¾à¦§à¦¿à¦à¦¾à¦°à¦à§ à¦à¦à¦¿à§à§ à¦¨à¦¿à¦¨à¥¤  ">
-<!ENTITY aboutTor.donationBanner.line2c "à¦¸à§à¦¬à¦¾à¦§à§à¦¨à¦¤à¦¾à¦° 
à¦à¦¨à§à¦¯ à¦à¦à¦¿à§à§ à¦à¦¸à§à¦¨ ">
-<!ENTITY aboutTor.donationBanner.line2d "à¦²à¦¾à¦à§ à¦²à§à¦à§à¦° 
à¦¬à§à¦¯à¦à§à¦¤à¦¿à¦à¦¤ à¦à§à¦ªà¦¨à§à§à¦¤à¦¾ à¦°à¦à§à¦·à¦¾ 
à¦à¦°à§à¦¨à¥¤ ">
-<!ENTITY aboutTor.donationBanner.line2e "à¦à¦°à¦à§ 
à¦¶à¦à§à¦¤à¦¿à¦¶à¦¾à¦²à§ à¦°à¦¾à¦à§à¦¨à¥¤ ">
-<!ENTITY aboutTor.donationBanner.line2f "à¦à¦ªà¦¨à¦¾à¦¦à§à¦° 
à¦¸à¦¾à¦¹à¦¾à¦¯à§à¦¯ à¦¦à¦°à¦à¦¾à¦°! ">
-<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
-<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
-<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation 
until 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "à¦à¦°à§à¦¥ à¦¸à¦¾à¦¹à¦¾à¦¯à§à¦¯ 
à¦à¦°à§à¦¨, à¦à¦¬à¦ à¦®à¦à¦¿à¦²à¦¾ à¦¸à¦®à¦ªà¦°à¦¿à¦®à¦¾à¦£ 
à¦¸à¦¾à¦¹à¦¾à¦¯à§à¦¯ à¦à¦°à¦¬à§à¥¤ ">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice 
as strong.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "à¦à¦à§à¦¨à¦¿ à¦¦à¦¾à¦¨ 
à¦à¦°à§à¦¨! ">
-<!ENTITY aboutTor.donationBanner.buttonB "à¦à¦®à¦¾à¦à§à¦ à¦¸à¦¾à¦¥à§ 
à¦¨à¦¿à¦¨">
diff --git a/src/chrome/locale/ca/aboutTor.dtd 
b/src/chrome/locale/ca/aboutTor.dtd
index 878ce7ad..ca8aee1c 100644
--- a/src/chrome/locale/ca/aboutTor.dtd
+++ b/src/chrome/locale/ca/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "Obteniu les darreres novetats de Tor 
directament a la safata d'entrada.">
 <!ENTITY aboutTor.newsletter.link_text "Inscriviu-vos a les noticies de Tor.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers">
-
-<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company.">
-<!ENTITY aboutTor.donationBanner.line2b "AvanÃ§ats drets humans universals.">
-<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom.">
-<!ENTITY aboutTor.donationBanner.line2d "Protegeix la privacitat de milions.">
-<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong.">
-<!ENTITY aboutTor.donationBanner.line2f "Necessitem el teu suport!">
-<!ENTITY aboutTor.donationBanner.line2g "RecolÃ§a la llibertat a internet.">
-<!ENTITY aboutTor.donationBanner.line2h "Defensa la web oberta.">
-<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation 
until 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match 
your donation.">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice 
as strong.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "Donate Now">
-<!ENTITY aboutTor.donationBanner.buttonB "Compta amb mi">
diff --git a/src/chrome/locale/cs/aboutTor.dtd 
b/src/chrome/locale/cs/aboutTor.dtd
index 31ccf6bd..2c29d50d 100644
--- a/src/chrome/locale/cs/aboutTor.dtd
+++ b/src/chrome/locale/cs/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "Nechte si posÃlat nejnovÄjÅ¡Ã 
informace o Toru.">
 <!ENTITY aboutTor.newsletter.link_text "PÅihlaste se k odbÄru zpravodaje 
Toru.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: SÃla je v poÄtu">
-
-<!ENTITY aboutTor.donationBanner.line2a "SpoleÄnost se zÃ¡libou v 
anonymitÄ.">
-<!ENTITY aboutTor.donationBanner.line2b "PosÃlenÃ vÅ¡eobecnÃ½ch lidskÃ½ch 
prÃ¡v.">
-<!ENTITY aboutTor.donationBanner.line2c "Postavte se za svobodu.">
-<!ENTITY aboutTor.donationBanner.line2d "ChrÃ¡nÃme soukromÃ milionÅ¯ lidÃ.">
-<!ENTITY aboutTor.donationBanner.line2e "Pomozte Toru sÃlit.">
-<!ENTITY aboutTor.donationBanner.line2f "PotÅebujeme vaÅ¡i podporu!">
-<!ENTITY aboutTor.donationBanner.line2g "PodpoÅte svobodu internetu.">
-<!ENTITY aboutTor.donationBanner.line2h "BraÅte otevÅenÃ½ web.">
-<!ENTITY aboutTor.donationBanner.line2i "PodpoÅte online soukromÃ a 
svobodu.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla dorovnÃ¡ kaÅ¾dÃ½ pÅÃspÄvek 
aÅ¾ do zaÄÃ¡tku roku 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "PÅispÄjte hned a Mozilla vÃ¡s dar 
zdvojnÃ¡sobÃ.">
-<!ENTITY aboutTor.donationBanner.line3b "PoÅ¡lete pÅÃspÄvek a ten se 
zdvojnÃ¡sobÃ.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "PÅispÄjte">
-<!ENTITY aboutTor.donationBanner.buttonB "Jdu do toho">
diff --git a/src/chrome/locale/da/aboutTor.dtd 
b/src/chrome/locale/da/aboutTor.dtd
index bc06d980..902a84fa 100644
--- a/src/chrome/locale/da/aboutTor.dtd
+++ b/src/chrome/locale/da/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "FÃ¥ de seneste nyheder fra Tor direkte i 
din indbakke.">
 <!ENTITY aboutTor.newsletter.link_text "Tilmeld Tor-nyheder.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: Styrke i antal">
-
-<!ENTITY aboutTor.donationBanner.line2a "Anonymitet elsker selskab.">
-<!ENTITY aboutTor.donationBanner.line2b "Avancerede universelle 
menneskerettigheder.">
-<!ENTITY aboutTor.donationBanner.line2c "SlÃ¥ et slag for frihed.">
-<!ENTITY aboutTor.donationBanner.line2d "Beskyt privatlivet af millioner.">
-<!ENTITY aboutTor.donationBanner.line2e "Hold Tor stÃ¦rk.">
-<!ENTITY aboutTor.donationBanner.line2f "Vi har brug for din stÃ¸tte!">
-<!ENTITY aboutTor.donationBanner.line2g "StÃ¸t internetfrihed.">
-<!ENTITY aboutTor.donationBanner.line2h "Forsvar det Ã¥bne web.">
-<!ENTITY aboutTor.donationBanner.line2i "StÃ¸t privatliv og frihed online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla matcher hver donation frem 
til 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "Giv i dag, og Mozilla vil matche din 
donation.">
-<!ENTITY aboutTor.donationBanner.line3b "Giv nu og din gave bliver dobbelt sÃ¥ 
stÃ¦rk.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "DonÃ©r nu">
-<!ENTITY aboutTor.donationBanner.buttonB "Jeg er med">
diff --git a/src/chrome/locale/de/aboutTor.dtd 
b/src/chrome/locale/de/aboutTor.dtd
index 0ffc979f..6bd2e164 100644
--- a/src/chrome/locale/de/aboutTor.dtd
+++ b/src/chrome/locale/de/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "Erhalte die neuesten Nachrichten von Tor 
direkt in den Posteingang.">
 <!ENTITY aboutTor.newsletter.link_text "Tor-Nachrichten abonnieren.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: StÃ¤rke in Zahlen">
-
-<!ENTITY aboutTor.donationBanner.line2a "AnonymitÃ¤t liebt Gemeinschaft">
-<!ENTITY aboutTor.donationBanner.line2b "Verbessere die Menschenrechte">
-<!ENTITY aboutTor.donationBanner.line2c "Setz dich ein fÃ¼r Freiheit.">
-<!ENTITY aboutTor.donationBanner.line2d "SchÃ¼tze die PrivatsphÃ¤re von 
Millionen Menschen.">
-<!ENTITY aboutTor.donationBanner.line2e "Mache Tor stark.">
-<!ENTITY aboutTor.donationBanner.line2f "Wir brauchen deine UnterstÃ¼tzung.">
-<!ENTITY aboutTor.donationBanner.line2g "UnterstÃ¼tze Internetfreiheit.">
-<!ENTITY aboutTor.donationBanner.line2h "Verteidige das offene Netz.">
-<!ENTITY aboutTor.donationBanner.line2i "UnterstÃ¼tze Datenschutz und Freiheit 
im Internet.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla unterstÃ¼tzt jede Spende bis 
2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "Gib noch heute, und Mozilla wird 
deiner Spende entsprechen.">
-<!ENTITY aboutTor.donationBanner.line3b "Spende jetzt, und dein Geschenk wird 
doppelt so stark.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "Spende jetzt">
-<!ENTITY aboutTor.donationBanner.buttonB "ZÃ¤hl mich mit">
diff --git a/src/chrome/locale/el/aboutTor.dtd 
b/src/chrome/locale/el/aboutTor.dtd
index d93a5a5a..dbddba88 100644
--- a/src/chrome/locale/el/aboutTor.dtd
+++ b/src/chrome/locale/el/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "ÎÎ¬Î²ÎµÏÎµ ÏÎ± ÏÎµÎ»ÎµÏÏÎ±Î¯Î± 
Î½ÎÎ± ÏÎ¿Ï Tor ÎºÎ±ÏÎµÏÎ¸ÎµÎ¯Î±Î½ ÏÏÎ± ÎµÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î± ÏÎ±Ï.">
 <!ENTITY aboutTor.newsletter.link_text "ÎÎ³Î³ÏÎ±ÏÏÎµÎ¯ÏÎµ Î³Î¹Î± ÏÎ± 
Î½ÎÎ± ÏÎ¿Ï Tor.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: ÎÏÏÏÏ ÎµÎ½ ÏÎ· 
ÎµÎ½ÏÏÎµÎ¹.">
-
-<!ENTITY aboutTor.donationBanner.line2a "Î Î±Î½ÏÎ½ÏÎ¼Î¯Î± Î±Î³Î±ÏÎ¬ ÏÎ·Î½ 
ÏÎ±ÏÎÎ±.">
-<!ENTITY aboutTor.donationBanner.line2b "Î ÏÎ¿ÏÎ¸Î®ÏÏÎµ ÏÎ± 
Î±Î½Î¸ÏÏÏÎ¹Î½Î± Î´Î¹ÎºÎ±Î¹ÏÎ¼Î±ÏÎ± ÏÎ±Î³ÎºÎ¿ÏÎ¼Î¯ÏÏ.">
-<!ENTITY aboutTor.donationBanner.line2c "Î¥ÏÎµÏÎ±ÏÏÎ¹ÏÏÎµÎ¯ÏÎµ ÏÎ·Î½ 
ÎµÎ»ÎµÏÎ¸ÎµÏÎ¯Î± ">
-<!ENTITY aboutTor.donationBanner.line2d "Î ÏÎ¿ÏÏÎ±ÏÎÏÏÎµ ÏÎ·Î½ 
Î¹Î´Î¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ± ÎµÎºÎ±ÏÎ¿Î¼Î¼ÏÏÎ¯ÏÎ½.">
-<!ENTITY aboutTor.donationBanner.line2e "ÎÎ¹Î±ÏÎ·ÏÎ®ÏÏÎµ ÏÎ¿ Tor Î¹ÏÏÏ
ÏÏ.">
-<!ENTITY aboutTor.donationBanner.line2f "Î§ÏÎµÎ¹Î±Î¶ÏÎ¼Î±ÏÏÎµ ÏÎ·Î½ Ï
ÏÎ¿ÏÏÎ®ÏÎ¹Î¾Î· ÏÎ±Ï!">
-<!ENTITY aboutTor.donationBanner.line2g "Î£ÏÎ·ÏÎ¯Î¾ÏÎµ ÏÎ·Î½ ÎµÎ»ÎµÏ
Î¸ÎµÏÎ¯Î± ÏÏÎ¿ Î´Î¹Î±Î´Î¯ÎºÏÏÎ¿.">
-<!ENTITY aboutTor.donationBanner.line2h "Î¥ÏÎµÏÎ±ÏÏÎ¹ÏÏÎµÎ¯ÏÎµ ÏÎ¿Î½ 
Î±Î½Î¿Î¹ÏÏÏ Î¹ÏÏÏ.">
-<!ENTITY aboutTor.donationBanner.line2i "Î£ÏÎ·ÏÎ¯Î¾ÏÎµ ÏÎ·Î½ 
Î¹Î´Î¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ± ÎºÎ±Î¹ ÏÎ·Î½ ÎµÎ»ÎµÏÎ¸ÎµÏÎ¯Î± ÏÏÎ¿ 
Î´Î¹Î±Î´Î¯ÎºÏÏÎ¿.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation 
until 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "ÎÏÏÎ¯ÏÏÎµ ÏÎ®Î¼ÎµÏÎ± ÎºÎ±Î¹ 
ÏÎ¿ Mozilla Î¸Î± Î´ÏÏÎ¯ÏÎµÎ¹ ÏÎ¿ Î¯Î´Î¹Î¿ ÏÎ¿ÏÏ!">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice 
as strong.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "ÎÎ¬Î½ÏÎµ Î¼Î¹Î± Î´ÏÏÎµÎ¬ 
ÏÏÏÎ±!">
-<!ENTITY aboutTor.donationBanner.buttonB "Î¥ÏÎ¿Î»Î¿Î³Î¯ÏÏÎµ Î¼Îµ">
diff --git a/src/chrome/locale/en-US/aboutTor.dtd 
b/src/chrome/locale/en-US/aboutTor.dtd
index a36d812c..1400d7b5 100644
--- a/src/chrome/locale/en-US/aboutTor.dtd
+++ b/src/chrome/locale/en-US/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to 
your inbox.">
 <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers">
-
-<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company.">
-<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights.">
-<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom.">
-<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions.">
-<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong.">
-<!ENTITY aboutTor.donationBanner.line2f "We need your support!">
-<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
-<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
-<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation 
until 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match 
your donation.">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice 
as strong.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "Donate Now">
-<!ENTITY aboutTor.donationBanner.buttonB "Count Me In">
diff --git a/src/chrome/locale/es-AR/aboutTor.dtd 
b/src/chrome/locale/es-AR/aboutTor.dtd
index fcb78004..1bb03e95 100644
--- a/src/chrome/locale/es-AR/aboutTor.dtd
+++ b/src/chrome/locale/es-AR/aboutTor.dtd
@@ -26,17 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "RecibÃ las Ãºltimas noticias de Tor 
derecho en tu bandeja de entrada.">
 <!ENTITY aboutTor.newsletter.link_text "Registrate en Tor News.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: Fortaleza en Canidad">
-
-<!ENTITY aboutTor.donationBanner.line2a "El anonimato ama la compaÃ±Ãa.">
-<!ENTITY aboutTor.donationBanner.line2b "Avanzar los derechos humanos 
universales.">
-<!ENTITY aboutTor.donationBanner.line2c "Plantarse por la libertad.">
-<!ENTITY aboutTor.donationBanner.line2d "Proteger la privacidad de millones.">
-<!ENTITY aboutTor.donationBanner.line2e "Mantener fuerte a Tor.">
-<!ENTITY aboutTor.donationBanner.line2f "Â¡Necesitamos tu apoyo!">
-
-<!ENTITY aboutTor.donationBanner.line3 "DÃ¡ hoy, y Mozilla emparejarÃ¡ tu 
donaciÃ³n.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "DonÃ¡ ahora">
-<!ENTITY aboutTor.donationBanner.buttonB "ContÃ¡ conmigo">
diff --git a/src/chrome/locale/es/aboutTor.dtd 
b/src/chrome/locale/es/aboutTor.dtd
index 2bb31865..c0934bde 100644
--- a/src/chrome/locale/es/aboutTor.dtd
+++ b/src/chrome/locale/es/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "Recibe las Ãºltimas noticias de Tor 
directamente en tu bandeja de entrada.">
 <!ENTITY aboutTor.newsletter.link_text "InscrÃbete en Tor News.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: La fuerza en la cantidad">
-
-<!ENTITY aboutTor.donationBanner.line2a "El anonimato ama la compaÃ±Ãa.">
-<!ENTITY aboutTor.donationBanner.line2b "Promover los derechos humanos 
universales.">
-<!ENTITY aboutTor.donationBanner.line2c "Defiende la libertad.">
-<!ENTITY aboutTor.donationBanner.line2d "Protege la privacidad de millones de 
personas.">
-<!ENTITY aboutTor.donationBanner.line2e "MantÃ©n fuerte a Tor.">
-<!ENTITY aboutTor.donationBanner.line2f "Necesitamos tu apoyo.">
-<!ENTITY aboutTor.donationBanner.line2g "Apoya la libertad en internet">
-<!ENTITY aboutTor.donationBanner.line2h "Defiende la web abierta">
-<!ENTITY aboutTor.donationBanner.line2i "Apoya la privacidad y la libertad en 
lÃnea.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla donarÃ¡ una cantidad 
idÃ©ntica a cada donaciÃ³n hasta 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "Dona hoy, y Mozilla igualarÃ¡ tu 
donaciÃ³n.">
-<!ENTITY aboutTor.donationBanner.line3b "Dona ahora, y tu donaciÃ³n se 
duplicarÃ¡.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "Dona ahora.">
-<!ENTITY aboutTor.donationBanner.buttonB "Cuenta conmigo.">
diff --git a/src/chrome/locale/eu/aboutTor.dtd 
b/src/chrome/locale/eu/aboutTor.dtd
index 9f1224bb..123091e5 100644
--- a/src/chrome/locale/eu/aboutTor.dtd
+++ b/src/chrome/locale/eu/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to 
your inbox.">
 <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers">
-
-<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company.">
-<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights.">
-<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom.">
-<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions.">
-<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong.">
-<!ENTITY aboutTor.donationBanner.line2f "We need your support!">
-<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
-<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
-<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation 
until 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match 
your donation.">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice 
as strong.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "Donate Now">
-<!ENTITY aboutTor.donationBanner.buttonB "Count Me In">
diff --git a/src/chrome/locale/fa/aboutTor.dtd 
b/src/chrome/locale/fa/aboutTor.dtd
index 2f572883..a4908b04 100644
--- a/src/chrome/locale/fa/aboutTor.dtd
+++ b/src/chrome/locale/fa/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "Ø¢Ø®Ø±ÛÙ Ø§Ø®Ø¨Ø§Ø± ØªÙØ± Ø±Ø§ Ø¯Ø± 
ØµÙØ¯ÙÙ ÙØ±ÙØ¯Û Ø®ÙØ¯ Ø¯Ø±ÛØ§ÙØª Ú©ÙÛØ¯.">
 <!ENTITY aboutTor.newsletter.link_text "Ø«Ø¨ØªâÙØ§Ù Ø¨Ø±Ø§Û Ø§Ø®Ø¨Ø§Ø± 
ØªÙØ±.">
-
-<!ENTITY aboutTor.donationBanner.line1 "ØªÙØ±: ÙØ¯Ø±Øª Ø¯Ø± Ø§Ø¹Ø¯Ø§Ø¯">
-
-<!ENTITY aboutTor.donationBanner.line2a "Ø´Ø±Ú©Øª Ú¯ÙÙØ§ÙÛØª Ø±Ø§ Ø¯ÙØ³Øª 
Ø¯Ø§Ø±Ø¯.">
-<!ENTITY aboutTor.donationBanner.line2b "ØÙØ§ÛØª Ø§Ø² ØÙÙÙ Ø¨Ø´Ø± 
Ø¬ÙØ§ÙÛ.">
-<!ENTITY aboutTor.donationBanner.line2c "Ø¨Ø±Ø§Û Ø¢Ø²Ø§Ø¯Û Ø§ÛØ³ØªØ§Ø¯Ú¯Û 
Ú©ÙÛØ¯.">
-<!ENTITY aboutTor.donationBanner.line2d "Ø§Ø² ØØ±ÛÙ Ø®ØµÙØµÛ Ù
ÛÙÛÙÙâÙØ§ ÙØØ§ÙØ¸Øª Ú©ÙÛØ¯">
-<!ENTITY aboutTor.donationBanner.line2e "ØªÙØ± Ø±Ø§ ÙØÚ©Ù ÙÚ¯Ù 
Ø¯Ø§Ø±ÛØ¯.">
-<!ENTITY aboutTor.donationBanner.line2f "ÙØ§ Ø¨Ù ØÙØ§ÛØª Ø´ÙØ§ ÙÛØ§Ø² 
Ø¯Ø§Ø±ÛÙ!">
-<!ENTITY aboutTor.donationBanner.line2g "Ø§Ø² Ø¢Ø²Ø§Ø¯Û Ø§ÛÙØªØ±ÙØª 
Ù¾Ø´ØªÛØ¨Ø§ÙÛ Ú©ÙÛØ¯.">
-<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
-<!ENTITY aboutTor.donationBanner.line2i "Ø§Ø² ØØ±ÛÙ Ø´Ø®ØµÛ Ù Ø¢Ø²Ø§Ø¯Û 
Ø¨Ø±Ø®Ø· Ø¯ÙØ§Ø¹ Ú©ÙÛØ¯.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation 
until 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match 
your donation.">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice 
as strong.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "Ø§Ú©ÙÙÙ Ø§ÙØ¯Ø§Ø¡ Ú©ÙÛØ¯">
-<!ENTITY aboutTor.donationBanner.buttonB "Ø±ÙÛ ÙÙ ØØ³Ø§Ø¨ Ú©Ù">
diff --git a/src/chrome/locale/fr/aboutTor.dtd 
b/src/chrome/locale/fr/aboutTor.dtd
index 0df6622d..6ae2392d 100644
--- a/src/chrome/locale/fr/aboutTor.dtd
+++ b/src/chrome/locale/fr/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "Obtenez les derniÃ¨res nouvelles au 
sujet de Tor directement dans votre boÃ®te de rÃ©ception.">
 <!ENTITY aboutTor.newsletter.link_text "Inscrivez-vous aux nouvelles de Tor">
-
-<!ENTITY aboutTor.donationBanner.line1 "TorÂ : lâunion fait la force">
-
-<!ENTITY aboutTor.donationBanner.line2a "Lâanonymat est contagieux.">
-<!ENTITY aboutTor.donationBanner.line2b "Promouvez les droits universels de la 
personne.">
-<!ENTITY aboutTor.donationBanner.line2c "DÃ©fendez la libertÃ©.">
-<!ENTITY aboutTor.donationBanner.line2d "ProtÃ©gez la vie privÃ©e de millions 
de personnes.">
-<!ENTITY aboutTor.donationBanner.line2e "Assurez la robustesse de Tor.">
-<!ENTITY aboutTor.donationBanner.line2f "Nous avons besoin de votre 
soutienâ!">
-<!ENTITY aboutTor.donationBanner.line2g "Soutenez la libertÃ© sur Internet.">
-<!ENTITY aboutTor.donationBanner.line2h "DÃ©fendez le Web ouvert.">
-<!ENTITY aboutTor.donationBanner.line2i "Soutenez la vie privÃ© et la libertÃ© 
en ligne.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla versera un montant 
Ã©quivalent Ã  chaque don jusquâen 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "Faites un don aujourdâhui et Mozilla 
fera un don Ã©quivalent.">
-<!ENTITY aboutTor.donationBanner.line3b "Faites un don maintenant et sa force 
en sera doublÃ©e.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant">
-<!ENTITY aboutTor.donationBanner.buttonB "Comptez sur moi">
diff --git a/src/chrome/locale/ga/aboutTor.dtd 
b/src/chrome/locale/ga/aboutTor.dtd
index 1978847e..ce6fe3f5 100644
--- a/src/chrome/locale/ga/aboutTor.dtd
+++ b/src/chrome/locale/ga/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "Faigh an nuacht is dÃ©anaÃ maidir le 
Tor i do bhosca isteach.">
 <!ENTITY aboutTor.newsletter.link_text "ClÃ¡raigh le Nuachtlitir Tor.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: NÃ neart go cur le chÃ©ile">
-
-<!ENTITY aboutTor.donationBanner.line2a "Dul i bhfolach sa slua.">
-<!ENTITY aboutTor.donationBanner.line2b "Cuir cearta daonna chun cinn.">
-<!ENTITY aboutTor.donationBanner.line2c "Seas an fÃ³d ar son na saoirse.">
-<!ENTITY aboutTor.donationBanner.line2d "Cosain prÃobhÃ¡ideachas na milliÃºn 
duine.">
-<!ENTITY aboutTor.donationBanner.line2e "Cuir taca le Tor.">
-<!ENTITY aboutTor.donationBanner.line2f "TÃ¡ do chÃºnamh de dhÃth orainn!">
-<!ENTITY aboutTor.donationBanner.line2g "Tacaigh le saoirse ar an idirlÃon.">
-<!ENTITY aboutTor.donationBanner.line2h "Seas an fÃ³d ar son an GhrÃ©asÃ¡in 
oscailte">
-<!ENTITY aboutTor.donationBanner.line2i "Tacaigh le prÃobhÃ¡ideachas agus le 
saoirse ar lÃne.">
-<!ENTITY aboutTor.donationBanner.line2j "TÃ¡ Mozilla ag meaitseÃ¡il gach euro 
a bhronntar orainn go dtÃ 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "Tabhair sÃntiÃºs airgid inniu agus 
tabharfaidh Mozilla an mÃ©id cÃ©anna arÃs dÃºinn.">
-<!ENTITY aboutTor.donationBanner.line3b "Beidh do bhronntanas airgid dhÃ¡ uair 
nÃos lÃ¡idre.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "Tabhair sÃntiÃºs airgid anois">
-<!ENTITY aboutTor.donationBanner.buttonB "Cuir mise san Ã¡ireamh">
diff --git a/src/chrome/locale/he/aboutTor.dtd 
b/src/chrome/locale/he/aboutTor.dtd
index 81a4386f..6d988035 100644
--- a/src/chrome/locale/he/aboutTor.dtd
+++ b/src/chrome/locale/he/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "×§×× ××ª ××××©××ª ××××¨×× 
××ª ×××ª Tor ××©××¨××ª ××ª××× ×× ×× ×¡×ª ×©××.">
 <!ENTITY aboutTor.newsletter.link_text "×××¨×©× ×¢×××¨ ×××©××ª Tor.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: ××××§ ×××¡×¤×¨××">
-
-<!ENTITY aboutTor.donationBanner.line2a "××××× ×××ª ×××××ª 
×××¨×.">
-<!ENTITY aboutTor.donationBanner.line2b "××××××ª ××× ×§×××××ª 
××§×××××ª.">
-<!ENTITY aboutTor.donationBanner.line2c "×¡× ××¨ ×¢× ×××¨××ª.">
-<!ENTITY aboutTor.donationBanner.line2d "××× ×¢× ×¤×¨××××ª× ×©× 
×××××× ××.">
-<!ENTITY aboutTor.donationBanner.line2e "×©×××¨ ×¢× Tor ×××§.">
-<!ENTITY aboutTor.donationBanner.line2f "×× ×× × ×¦×¨×××× ××ª 
×ª××××ª×!">
-<!ENTITY aboutTor.donationBanner.line2g "×ª××× ××××¨××ª ××× ××¨× 
×.">
-<!ENTITY aboutTor.donationBanner.line2h "××× ×¢× ××¨×©×ª ××¤×ª×××.">
-<!ENTITY aboutTor.donationBanner.line2i "×ª××× ××¤×¨××××ª 
×××××¨××ª ××××¤× ××§×××.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla ××©××× ×× ×ª×¨××× 
×¢× 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "×ª× ××××, ×Ö¾Mozilla ×ª×©××× 
××ª ×ª×¨×××ª×.">
-<!ENTITY aboutTor.donationBanner.line3b "×ª× ×¢××©××, ××××ª× × ×©×× 
×××¤××ª ××××§× ×¤× ×©× ×××.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "×ª×¨×× ×¢××©××">
-<!ENTITY aboutTor.donationBanner.buttonB "×××©× ×××ª×">
diff --git a/src/chrome/locale/hu/aboutTor.dtd 
b/src/chrome/locale/hu/aboutTor.dtd
index cbc0c571..b5dd867d 100644
--- a/src/chrome/locale/hu/aboutTor.dtd
+++ b/src/chrome/locale/hu/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "Kapja meg a legfrissebb Tor hÃreket 
kÃ¶zvetlenÃ¼l email fiÃ³kjÃ¡ba.">
 <!ENTITY aboutTor.newsletter.link_text "Iratkozzon fel a Tor hÃrekhez.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: ErÅssÃ©g a szÃ¡mokban">
-
-<!ENTITY aboutTor.donationBanner.line2a "Az anonimitÃ¡s szereti a cÃ©geket.">
-<!ENTITY aboutTor.donationBanner.line2b "ÃltalÃ¡nosan nÃ¶veli az emberi 
jogokat.">
-<!ENTITY aboutTor.donationBanner.line2c "KiÃ¡ll a szabadsÃ¡gÃ©rt.">
-<!ENTITY aboutTor.donationBanner.line2d "VÃ©di milliÃ³k magÃ¡nÃ©letÃ©t.">
-<!ENTITY aboutTor.donationBanner.line2e "Tartsuk a Tor-t erÅsnek.">
-<!ENTITY aboutTor.donationBanner.line2f "SzÃ¼ksÃ©gÃ¼nk van a tÃ¡mogatÃ¡sÃ¡ra!">
-<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
-<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
-<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation 
until 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "Adjon ma Ã©s a Mozilla is annyival 
tÃ¡mogat.">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice 
as strong.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "TÃ¡mogasson most">
-<!ENTITY aboutTor.donationBanner.buttonB "SzÃ¡mÃtsatok bele">
diff --git a/src/chrome/locale/id/aboutTor.dtd 
b/src/chrome/locale/id/aboutTor.dtd
index 9370e3ad..3a4e3a27 100644
--- a/src/chrome/locale/id/aboutTor.dtd
+++ b/src/chrome/locale/id/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "Dapatkan berita Tor terbaru langsung ke 
inbox Anda.">
 <!ENTITY aboutTor.newsletter.link_text "Daftar untuk mendapatkan Berita Tor.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers">
-
-<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company.">
-<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights.">
-<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom.">
-<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions.">
-<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong.">
-<!ENTITY aboutTor.donationBanner.line2f "We need your support!">
-<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
-<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
-<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation 
until 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match 
your donation.">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice 
as strong.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "Donate Now">
-<!ENTITY aboutTor.donationBanner.buttonB "Count Me In">
diff --git a/src/chrome/locale/is/aboutTor.dtd 
b/src/chrome/locale/is/aboutTor.dtd
index 0fd4f643..0a259108 100644
--- a/src/chrome/locale/is/aboutTor.dtd
+++ b/src/chrome/locale/is/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "FÃ¡Ã°u nÃ½justu frÃ©ttir af Tor beint Ã 
pÃ³sthÃ³lfiÃ° Ã¾itt.">
 <!ENTITY aboutTor.newsletter.link_text "SkrÃ¡Ã°u Ã¾ig til aÃ° fÃ¡ 
Tor-frÃ©ttir.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: Styrkur Ã fjÃ¶ldanum">
-
-<!ENTITY aboutTor.donationBanner.line2a "Nafnleysi krefst fÃ©lagsskapar.">
-<!ENTITY aboutTor.donationBanner.line2b "Setjum mannrÃ©ttindi Ã¡ oddinn.">
-<!ENTITY aboutTor.donationBanner.line2c "StÃ¶ndum saman meÃ° frelsinu.">
-<!ENTITY aboutTor.donationBanner.line2d "Verndum friÃ°helgi milljÃ³na manna.">
-<!ENTITY aboutTor.donationBanner.line2e "HÃ¶ldum Tor sterku">
-<!ENTITY aboutTor.donationBanner.line2f "ViÃ° Ã¾Ã¶rfnumst stuÃ°nings Ã¾Ãns!">
-<!ENTITY aboutTor.donationBanner.line2g "Stattu meÃ° frelsi Ã¡ netinu.">
-<!ENTITY aboutTor.donationBanner.line2h "VerÃ°u hinn opna vef.">
-<!ENTITY aboutTor.donationBanner.line2i "VerÃ°u rÃ©tt Ã¾inn til einkalÃfs og 
frelsis Ã¡ netinu.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla jafnar upp hvert fjÃ¡rframlag 
allt til 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "GefÃ°u Ã dag - og Mozilla mun jafna 
framlag Ã¾itt.">
-<!ENTITY aboutTor.donationBanner.line3b "GefÃ°u upphÃ¦Ã° nÃºna - og gjÃ¶fin 
Ã¾Ãn mun tvÃ¶faldast.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "Styrkja nÃºna">
-<!ENTITY aboutTor.donationBanner.buttonB "ReikniÃ° meÃ° mÃ©r">
diff --git a/src/chrome/locale/it/aboutTor.dtd 
b/src/chrome/locale/it/aboutTor.dtd
index daad7130..b9687c45 100644
--- a/src/chrome/locale/it/aboutTor.dtd
+++ b/src/chrome/locale/it/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "Ottieni le ultime info da Tor 
direttamente nella tua casella di posta elettronica.">
 <!ENTITY aboutTor.newsletter.link_text "Registrati alle Tor News.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: la Forza in Numeri">
-
-<!ENTITY aboutTor.donationBanner.line2a "L'anonimato ama l'azienda.">
-<!ENTITY aboutTor.donationBanner.line2b "Migliora i diritti universali 
dell'uomo.">
-<!ENTITY aboutTor.donationBanner.line2c "Difendi la libertÃ .">
-<!ENTITY aboutTor.donationBanner.line2d "Protegge la privacy di milioni.">
-<!ENTITY aboutTor.donationBanner.line2e "Mantieni Tor forte.">
-<!ENTITY aboutTor.donationBanner.line2f "Abbiamo bisogno del tuo supporto!">
-<!ENTITY aboutTor.donationBanner.line2g "Supporta la libertÃ  di internet.">
-<!ENTITY aboutTor.donationBanner.line2h "Difendi il web aperto.">
-<!ENTITY aboutTor.donationBanner.line2i "Sostieni la privacy e la libertÃ  
online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla corrisponderÃ  tutte le 
donazioni fino al 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "Dai oggi, e Mozilla ricambierÃ  la tua 
donazione.">
-<!ENTITY aboutTor.donationBanner.line3b "Dona ora e il tuo regalo diventerÃ  
due volte piÃ¹ valoroso.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "Dona Ora">
-<!ENTITY aboutTor.donationBanner.buttonB "Contami">
diff --git a/src/chrome/locale/ja/aboutTor.dtd 
b/src/chrome/locale/ja/aboutTor.dtd
index e5c0d7ea..c8963418 100644
--- a/src/chrome/locale/ja/aboutTor.dtd
+++ b/src/chrome/locale/ja/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to 
your inbox.">
 <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers">
-
-<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company.">
-<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights.">
-<!ENTITY aboutTor.donationBanner.line2c "èªç±ã®ããã«ç«ã¡ä¸ããã">
-<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions.">
-<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong.">
-<!ENTITY aboutTor.donationBanner.line2f "æã
ã«ã¯ããªãã®ãµãã¼ããå¿è¦ã§ã!">
-<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
-<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
-<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation 
until 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match 
your donation.">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice 
as strong.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "ä»ããå¯ä»">
-<!ENTITY aboutTor.donationBanner.buttonB "Count Me In">
diff --git a/src/chrome/locale/ka/aboutTor.dtd 
b/src/chrome/locale/ka/aboutTor.dtd
index 3b5bdad3..ec34af9e 100644
--- a/src/chrome/locale/ka/aboutTor.dtd
+++ b/src/chrome/locale/ka/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "áááá¦áá 
á¡ááá®ááááá Tor-áá¡ááá, ááá ááááá  
áá¥áááá¡ á¡áá¤áá¡á¢á á§á£áá¨á.">
 <!ENTITY aboutTor.newsletter.link_text "áááááá¬áá áá 
Tor-áá¡ á¡ááá®ááááá.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: á¡áá«áááá á 
áªáá¤á ááá¨á">
-
-<!ENTITY aboutTor.donationBanner.line2a "áááááááá¡ 
ááááá¦ááááááá¡ááá áááªáá á¡áááá 
áááá¡ á®ááá®áá¡ á¡ááá ááááá¡.">
-<!ENTITY aboutTor.donationBanner.line2b "áááá£áá¯áááá¡áá 
ááááááááá¡ á£á¤ááááááá¡ áááªáá.">
-<!ENTITY aboutTor.donationBanner.line2c "áá®áá á ááá£ááá 
áá ááááá¡á£á¤ááááá¡.">
-<!ENTITY aboutTor.donationBanner.line2d "ááááªáááá 
áááááááááá ááááááááá¡ ááá ááá 
áááááªááááá.">
-<!ENTITY aboutTor.donationBanner.line2e "á¨ááááá á©á£ááá Tor 
á«áááá á.">
-<!ENTITY aboutTor.donationBanner.line2f "á©ááá áááá¡áááá 
áááá áá¥áááá áááá áá¨á ááááá!">
-<!ENTITY aboutTor.donationBanner.line2g "áá®áá á ááá£ááá 
áá ááááá¡á£á¤áá ááá¢áá ááá¢á¡.">
-<!ENTITY aboutTor.donationBanner.line2h "ááááªáááá 
ááá¢áá ááá¢áá¡ á¦ááááá.">
-<!ENTITY aboutTor.donationBanner.line2i "áá®áá á ááá£ááá 
áá ááá ááá áááááªáááááá¡ 
á®ááá¨áá£á®ááááááá¡á áá 
ááááá¡á£á¤ááááá¡ á£áá á£ááááá§áá¤áá¡ 
ááá¢áá ááá¢á¡ááá áªáá¨á.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla ááááá 
áááááá¡ áááááá£á á¨áááá¬áá á£á 
á¨áááá¢ááá¡ 2019 á¬ááááá.">
-
-<!ENTITY aboutTor.donationBanner.line3 "ááááªáá áá¦áá¡áá 
áá Mozilla ááááá áááááá¡ áá¥áááá¡ 
á¨áááá¬áá á£ááááá¡.">
-<!ENTITY aboutTor.donationBanner.line3b "ááááªáá áááá®á 
áá®áááá áá áá¥áááá á¨áááá¬áá 
á£áááá áá á¯áá  ááá¢áá áá«áááá á 
áá¥áááá.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "áááá®áá¡ 
ááá¦ááá áá®áááá">
-<!ENTITY aboutTor.donationBanner.buttonB "á©ááá á¬áááááá¡ 
áá¦ááá¨ááá">
diff --git a/src/chrome/locale/ko/aboutTor.dtd 
b/src/chrome/locale/ko/aboutTor.dtd
index cf8143ab..984b53af 100644
--- a/src/chrome/locale/ko/aboutTor.dtd
+++ b/src/chrome/locale/ko/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "ìµì ì Tor ë´ì¤ë¥¼ ë°ì 
í¸ì§í¨ì ê³§ì¥ ë°ì¼ììì¤.">
 <!ENTITY aboutTor.newsletter.link_text "Tor ë´ì¤ë¥¼ êµ¬ë.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers">
-
-<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company.">
-<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights.">
-<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom.">
-<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions.">
-<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong.">
-<!ENTITY aboutTor.donationBanner.line2f "We need your support!">
-<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
-<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
-<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation 
until 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match 
your donation.">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice 
as strong.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "Donate Now">
-<!ENTITY aboutTor.donationBanner.buttonB "Count Me In">
diff --git a/src/chrome/locale/nb/aboutTor.dtd 
b/src/chrome/locale/nb/aboutTor.dtd
index a5e61845..89bd5a7f 100644
--- a/src/chrome/locale/nb/aboutTor.dtd
+++ b/src/chrome/locale/nb/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "FÃ¥ de siste nyhetene fra Tor rett til 
innboksen din.">
 <!ENTITY aboutTor.newsletter.link_text "Registrer deg for Tor Nyheter.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers">
-
-<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company.">
-<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights.">
-<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom.">
-<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions.">
-<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong.">
-<!ENTITY aboutTor.donationBanner.line2f "We need your support!">
-<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
-<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
-<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation 
until 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match 
your donation.">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice 
as strong.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "Donate Now">
-<!ENTITY aboutTor.donationBanner.buttonB "Count Me In">
diff --git a/src/chrome/locale/nl/aboutTor.dtd 
b/src/chrome/locale/nl/aboutTor.dtd
index 8929fc65..822c3548 100644
--- a/src/chrome/locale/nl/aboutTor.dtd
+++ b/src/chrome/locale/nl/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "Krijg het laatste Tor nieuws regelrecht 
in jouw inbox.">
 <!ENTITY aboutTor.newsletter.link_text "Meld je aan voor Tor Nieuws.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: Kracht in Nummers">
-
-<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company.">
-<!ENTITY aboutTor.donationBanner.line2b "Universele rechten van de mens 
bevorderen.">
-<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom.">
-<!ENTITY aboutTor.donationBanner.line2d "Bescherm de privacy van miljoenen.">
-<!ENTITY aboutTor.donationBanner.line2e "Houdt Tor sterk.">
-<!ENTITY aboutTor.donationBanner.line2f "We hebben jouw ondersteuning nodig!">
-<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
-<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
-<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation 
until 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "Geef vandaag, en Mozilla geeft 
hetzelfde bedrag.">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice 
as strong.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "Geef Nu">
-<!ENTITY aboutTor.donationBanner.buttonB "Ik Doe Mee">
diff --git a/src/chrome/locale/pl/aboutTor.dtd 
b/src/chrome/locale/pl/aboutTor.dtd
index b523d30d..fe79cc3d 100644
--- a/src/chrome/locale/pl/aboutTor.dtd
+++ b/src/chrome/locale/pl/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to 
your inbox.">
 <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: SiÅa w liczbach">
-
-<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company.">
-<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights.">
-<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom.">
-<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions.">
-<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong.">
-<!ENTITY aboutTor.donationBanner.line2f "We need your support!">
-<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
-<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
-<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation 
until 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match 
your donation.">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice 
as strong.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "Donate Now">
-<!ENTITY aboutTor.donationBanner.buttonB "Count Me In">
diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd 
b/src/chrome/locale/pt-BR/aboutTor.dtd
index 02a848a7..130f2b13 100644
--- a/src/chrome/locale/pt-BR/aboutTor.dtd
+++ b/src/chrome/locale/pt-BR/aboutTor.dtd
@@ -27,22 +27,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "Receba as Ãºltimas notÃcias do Tor 
diretamente na sua caixa de e-mail.">
 <!ENTITY aboutTor.newsletter.link_text "Inscreva-se para receber NotÃcias do 
Tor.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: Nossa ForÃ§a em NÃºmeros">
-
-<!ENTITY aboutTor.donationBanner.line2a "Anonimidade adora companhia ">
-<!ENTITY aboutTor.donationBanner.line2b "AvanÃ§ar os direitos humanos 
universais.">
-<!ENTITY aboutTor.donationBanner.line2c "Defender a liberdade.">
-<!ENTITY aboutTor.donationBanner.line2d "Proteger a privacidade de milhÃµes de 
pessoas.">
-<!ENTITY aboutTor.donationBanner.line2e "Manter a forÃ§a do Tor.">
-<!ENTITY aboutTor.donationBanner.line2f "Precisamos do seu apoio!">
-<!ENTITY aboutTor.donationBanner.line2g "ApÃ³ie a liberdade na internet.">
-<!ENTITY aboutTor.donationBanner.line2h "Defenda a web aberta.">
-<!ENTITY aboutTor.donationBanner.line2i "ApÃ³ie a privacidade e liberdade 
online.">
-<!ENTITY aboutTor.donationBanner.line2j "A Mozilla estÃ¡ combinando cada 
doaÃ§Ã£o atÃ© 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "Doe hoje, e a Mozilla duplicarÃ¡ a sua 
doaÃ§Ã£o.">
-<!ENTITY aboutTor.donationBanner.line3b "DÃª agora, e seu presente se torna 
duas vezes mais forte.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "Doar Agora">
-<!ENTITY aboutTor.donationBanner.buttonB "Estou dentro">
diff --git a/src/chrome/locale/ru/aboutTor.dtd 
b/src/chrome/locale/ru/aboutTor.dtd
index 1bc187b8..b3d2f631 100644
--- a/src/chrome/locale/ru/aboutTor.dtd
+++ b/src/chrome/locale/ru/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "ÐÐ¾Ð»ÑÑÐ°Ð¹ÑÐµ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ðµ 
Ð½Ð¾Ð²Ð¾ÑÑÐ¸ Tor Ð¿ÑÑÐ¼Ð¾ Ð½Ð° Ð²Ð°Ñ Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÑÑÐ¸Ðº.">
 <!ENTITY aboutTor.newsletter.link_text "ÐÐ¾Ð´Ð¿Ð¸ÑÐ¸ÑÐµÑÑ Ð½Ð° 
Ð½Ð¾Ð²Ð¾ÑÑÐ¸ Tor.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: Ð¡Ð¸Ð»Ð° Ð² ÑÐ¸ÑÑÐ°Ñ">
-
-<!ENTITY aboutTor.donationBanner.line2a "ÐÐ½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ÑÑÑ ÑÐ²Ð°Ð¶Ð°ÐµÑ 
ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸Ð¸.">
-<!ENTITY aboutTor.donationBanner.line2b "ÐÑÐ¾Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ðµ 
Ð²ÑÐµÐ¾Ð±ÑÐ¸Ñ Ð¿ÑÐ°Ð² ÑÐµÐ»Ð¾Ð²ÐµÐºÐ°.">
-<!ENTITY aboutTor.donationBanner.line2c "ÐÑÑÐ°Ð½ÑÑÐµ Ð½Ð° 
ÑÐ²Ð¾Ð±Ð¾Ð´Ñ.">
-<!ENTITY aboutTor.donationBanner.line2d "ÐÐ±ÐµÑÐ¿ÐµÑÐ¸Ð²Ð°ÐµÐ¼ 
ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÑ Ð¼Ð¸Ð»Ð»Ð¸Ð¾Ð½Ð°Ð¼ Ð»ÑÐ´ÐµÐ¹.">
-<!ENTITY aboutTor.donationBanner.line2e "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÐµ Tor 
ÑÐ¸Ð»ÑÐ½ÑÐ¼.">
-<!ENTITY aboutTor.donationBanner.line2f "ÐÐ°Ð¼ Ð½ÑÐ¶Ð½Ð° ÑÐ²Ð¾Ñ 
Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÐ°!">
-<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
-<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
-<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation 
until 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "ÐÐ¾Ð¶ÐµÑÑÐ²ÑÐ¹ÑÐµ ÑÐµÐ³Ð¾Ð´Ð½Ñ 
Ð¸ Mozilla ÑÐ´Ð²Ð¾Ð¸Ñ ÐÐ°ÑÐµ Ð¿Ð¾Ð¶ÐµÑÑÐ²Ð¾Ð²Ð°Ð½Ð¸Ðµ.">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice 
as strong.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "ÐÐ¾Ð¶ÐµÑÑÐ²Ð¾Ð²Ð°ÑÑ">
-<!ENTITY aboutTor.donationBanner.buttonB "ÐÐ¾ÑÑÐ¸ÑÐ°Ð¹ÑÐµ">
diff --git a/src/chrome/locale/sv/aboutTor.dtd 
b/src/chrome/locale/sv/aboutTor.dtd
index f2938e54..423d6e96 100644
--- a/src/chrome/locale/sv/aboutTor.dtd
+++ b/src/chrome/locale/sv/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "FÃ¥ de senaste nyheterna frÃ¥n Tor 
direkt till din inkorg.">
 <!ENTITY aboutTor.newsletter.link_text "AnmÃ¤l dig till Tor-nyheter.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: Styrka i antal">
-
-<!ENTITY aboutTor.donationBanner.line2a "Anonymitet Ã¤lskar sÃ¤llskap.">
-<!ENTITY aboutTor.donationBanner.line2b "FrÃ¤mja universella mÃ¤nskliga 
rÃ¤ttigheter.">
-<!ENTITY aboutTor.donationBanner.line2c "StÃ¥ upp fÃ¶r frihet.">
-<!ENTITY aboutTor.donationBanner.line2d "Skydda miljontals privatliv.">
-<!ENTITY aboutTor.donationBanner.line2e "HÃ¥ll Tor stark.">
-<!ENTITY aboutTor.donationBanner.line2f "Vi behÃ¶ver ert stÃ¶d!">
-<!ENTITY aboutTor.donationBanner.line2g "StÃ¶d internetfrihet.">
-<!ENTITY aboutTor.donationBanner.line2h "FÃ¶rsvara den Ã¶ppna webben.">
-<!ENTITY aboutTor.donationBanner.line2i "StÃ¶d integritet och frihet pÃ¥ 
nÃ¤tet.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla matchar varje donation fram 
till 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "Ge idag, och Mozilla kommer att matcha 
din donation.">
-<!ENTITY aboutTor.donationBanner.line3b "Ge nu, och din gÃ¥va blir dubbelt sÃ¥ 
stark.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "Donera nu">
-<!ENTITY aboutTor.donationBanner.buttonB "RÃ¤kna med mig">
diff --git a/src/chrome/locale/tr/aboutTor.dtd 
b/src/chrome/locale/tr/aboutTor.dtd
index 789e3d81..ce8761f2 100644
--- a/src/chrome/locale/tr/aboutTor.dtd
+++ b/src/chrome/locale/tr/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "Tor ile ilgili son geliÅmeler doÄrudan 
e-posta kutunuza gelsin.">
 <!ENTITY aboutTor.newsletter.link_text "Tor Haber BÃ¼ltenine Abone Olun">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: Birlikten Kuvvet DoÄar">
-
-<!ENTITY aboutTor.donationBanner.line2a "Anonimlik birlikteliÄi sever.">
-<!ENTITY aboutTor.donationBanner.line2b "Evrensel insan haklarÄ±nÄ± 
geliÅtir.">
-<!ENTITY aboutTor.donationBanner.line2c "ÃzgÃ¼rlÃ¼ÄÃ¼ savun.">
-<!ENTITY aboutTor.donationBanner.line2d "MilyonlarÄ±n gizliliÄini koru.">
-<!ENTITY aboutTor.donationBanner.line2e "Tor uygulamasÄ±nÄ±n gÃ¼cÃ¼nÃ¼ koru.">
-<!ENTITY aboutTor.donationBanner.line2f "DesteÄinize ihtiyacÄ±mÄ±z var!">
-<!ENTITY aboutTor.donationBanner.line2g "Ä°nternet Ã¶zgÃ¼rlÃ¼ÄÃ¼nÃ¼ 
destekleyin">
-<!ENTITY aboutTor.donationBanner.line2h "AÃ§Ä±k web dÃ¼ÅÃ¼ncesini savunun.">
-<!ENTITY aboutTor.donationBanner.line2i "KiÅisel gizliliÄi ve Ã§evrimiÃ§i 
Ã¶zgÃ¼rlÃ¼ÄÃ¼ destekleyin.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla 2019 yÄ±lÄ±na kadar yapÄ±lan 
her baÄÄ±Åa karÅÄ±lÄ±k veriyor.">
-
-<!ENTITY aboutTor.donationBanner.line3 "BugÃ¼n yaptÄ±ÄÄ±nÄ±z her baÄÄ±Å 
kadar Mozilla da baÄÄ±Å yapacak.">
-<!ENTITY aboutTor.donationBanner.line3b "BaÄÄ±Å yapÄ±n ve hediyeniz iki kat 
gÃ¼zel olsun.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "Åimdi BaÄÄ±Å YapÄ±n">
-<!ENTITY aboutTor.donationBanner.buttonB "Ben de VarÄ±m">
diff --git a/src/chrome/locale/vi/aboutTor.dtd 
b/src/chrome/locale/vi/aboutTor.dtd
index 09c26101..f8bc3896 100644
--- a/src/chrome/locale/vi/aboutTor.dtd
+++ b/src/chrome/locale/vi/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "Nháºn thÃ´ng tin má»i nháº¥t tá»« Tor 
ÄÆ°á»£c gá»i tá»i há»p thÆ° cá»§a báº¡n.">
 <!ENTITY aboutTor.newsletter.link_text "ÄÄng kÃ nháºn tin tá»©c tá»« Tor.">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: Sá»©c máº¡nh náº±m á» Sá» 
lÆ°á»£ng ngÆ°á»i tham gia máº¡ng lÆ°á»i">
-
-<!ENTITY aboutTor.donationBanner.line2a "Viá»c áº©n danh cáº§n sá»± Äá»ng 
hÃ nh cá»§a cá»ng Äá»ng">
-<!ENTITY aboutTor.donationBanner.line2b "NÃ¢ng cao phá» biáº¿n nhÃ¢n 
quyá»n.">
-<!ENTITY aboutTor.donationBanner.line2c "Äá»©ng lÃªn vÃ¬ tá»± do.">
-<!ENTITY aboutTor.donationBanner.line2d "Báº£o vá» sá»± riÃªng tÆ° cá»§a hÃ 
ng triá»u ngÆ°á»i.">
-<!ENTITY aboutTor.donationBanner.line2e "Giá»¯ cho Tor trá» nÃªn máº¡nh 
máº½.">
-<!ENTITY aboutTor.donationBanner.line2f "ChÃºng tÃ´i cáº§n sá»± há» trá»£ 
cá»§a báº¡n!">
-<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
-<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
-<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation 
until 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "HÃ£y ÄÃ³ng gÃ³p ngay hÃ´m nay, vÃ  
Mozilla sáº½ ÄÃ³ng gÃ³p tÆ°Æ¡ng á»©ng vá»i pháº§n cá»§a báº¡n.">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice 
as strong.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "ÄÃ³ng gÃ³p Ngay bÃ¢y giá»">
-<!ENTITY aboutTor.donationBanner.buttonB "HÃ£y cho tÃ´i tham gia">
diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd 
b/src/chrome/locale/zh-CN/aboutTor.dtd
index 2707eb0a..36e9b9a5 100644
--- a/src/chrome/locale/zh-CN/aboutTor.dtd
+++ b/src/chrome/locale/zh-CN/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "éè¿é®ä»¶è·å Tor 
çææ°æ¶æ¯ã">
 <!ENTITY aboutTor.newsletter.link_text "æ³¨å Tor æ°é»åè¡¨">
-
-<!ENTITY aboutTor.donationBanner.line1 "Torï¼ä¼äººæ¾æ´ç«ç°é«">
-
-<!ENTITY aboutTor.donationBanner.line2a "å¿åçè¡¨ç¤ºå¯¹å¬å¸çç±æã">
-<!ENTITY aboutTor.donationBanner.line2b "æ¨è¿åºæ¬äººæã">
-<!ENTITY aboutTor.donationBanner.line2c "ä¸ºèªç±ååã">
-<!ENTITY aboutTor.donationBanner.line2d "ä¿æ¤æ°ç¾ä¸äººçéç§ã">
-<!ENTITY aboutTor.donationBanner.line2e "è®© Tor ç½ç»ä¿æå¥å£®ã">
-<!ENTITY aboutTor.donationBanner.line2f "æä»¬éè¦ä½ çå¸®å©ï¼">
-<!ENTITY aboutTor.donationBanner.line2g "æ¯æäºèç½èªç±ã">
-<!ENTITY aboutTor.donationBanner.line2h "æå«äºèç½çå¼æ¾ã">
-<!ENTITY aboutTor.donationBanner.line2i "ä¿ééç§åç½ç»èªç±ã">
-<!ENTITY aboutTor.donationBanner.line2j "ç´å°2019å¹´ï¼Mozilla å°å¹é
æææèµ ã">
-
-<!ENTITY aboutTor.donationBanner.line3 "ç°å¨ææ¬¾ï¼ Mozilla ä¹è½ä»ä½ 
çæèµ ä¸åçã">
-<!ENTITY aboutTor.donationBanner.line3b "ç°å¨æèµ 
ï¼æ¨çæ¯æå°åä½ååçåéã">
-
-<!ENTITY aboutTor.donationBanner.buttonA "ç°å¨å°±æå©">
-<!ENTITY aboutTor.donationBanner.buttonB "ç®æä¸ä¸ª">
diff --git a/src/chrome/locale/zh-TW/aboutTor.dtd 
b/src/chrome/locale/zh-TW/aboutTor.dtd
index bcbec612..bd5fa14d 100644
--- a/src/chrome/locale/zh-TW/aboutTor.dtd
+++ b/src/chrome/locale/zh-TW/aboutTor.dtd
@@ -26,22 +26,3 @@
 
 <!ENTITY aboutTor.newsletter.tagline "å° Tor 
çææ°æ¶æ¯ç´æ¥å³éå°æ¨çæ¶ä»¶å£ã">
 <!ENTITY aboutTor.newsletter.link_text "è¨é± Tor çæ°è³è¨ã">
-
-<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers">
-
-<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company.">
-<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights.">
-<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom.">
-<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions.">
-<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong.">
-<!ENTITY aboutTor.donationBanner.line2f "æåéè¦æ¨çæ¯æ´ï¼">
-<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
-<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
-<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation 
until 2019.">
-
-<!ENTITY aboutTor.donationBanner.line3 "ä»æ¥æ¨ææ¬¾ï¼Mozilla 
ä¹ææåºç¸åæ¸é¡ã">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice 
as strong.">
-
-<!ENTITY aboutTor.donationBanner.buttonA "ç«å»ææ¬¾">
-<!ENTITY aboutTor.donationBanner.buttonB "æä¹è¦å å¥ï¼">
diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css
index 9f195cfd..ce0a2f29 100644
--- a/src/chrome/skin/aboutTor.css
+++ b/src/chrome/skin/aboutTor.css
@@ -272,126 +272,74 @@ body:not([showmanual]) .showForManual {
   border-radius: 50px 50px 0 0;
 }
 
-/* Donation Banner
+/* Tor News Signup Banner
  * While this banner is present, we need to
  * offset the elements normally at the top of
  * the window.
  */
 
-#donation-banner {
+#tornews-banner {
   display: flex;
-  align-items: stretch;
+  align-items: center;
   background-color: white;
   color: var(--abouttor-bg-toron-color);
   font-size: 16px;
-  height: 200px;
-  justify-content: center;
+  height: 60px;
+  justify-content: space-between;
   left: 0px;
   right: 0px;
   top: 0px;
-  position: absolute;
-  transform: translateY(-200px);
+  transform: translateY(-60px);
   transition: transform 200ms;
-  z-index: 1;
 }
 
-body[show-donation-banner="true"] #donation-banner {
+body[show-tornews-banner="true"] #tornews-banner {
   transform: translateY(0px);
   transition: transform 0ms;
 }
 
-#donation-banner-image {
-  background: url('chrome://torbutton/skin/donation_banner_image_3x.png') 
no-repeat center center;
-  background-size: contain;
-  height: 190px;
-  margin: 10px 10px 0px 0px;
-  width: 400px;
+#tornews-banner-message {
+  align-items: center;
+  display: flex;
+  justify-content: center;
+}
+
+#tornews-banner-message a {
+  color: var(--abouttor-bg-toron-color);
+}
+
+#tornews-banner-icon {
+  background: url('chrome://torbutton/skin/newsletter_3x.png') no-repeat 
center center;
+  background-size: cover;
+  height: 32px;
+  margin: 0px 16px;
+  width: 32px;
 }
 
-#donation-banner-closer {
+#tornews-banner-closer {
   display: flex;
   align-items: center;
   font-size: 20px;
   height: 22px;
   justify-content: center;
-  margin: 4px;
+  margin: 4px 20px;
   padding: 4px;
-  position: absolute;
-  offset-inline-end: 0px;
-  top: 0px;
   width: 22px;
   -moz-user-select: none;
 }
 
-#donation-banner-closer:hover {
+#tornews-banner-closer:hover {
   background-color: gray;
   cursor: pointer;
 }
 
-#donation-banner-lines {
-  align-items: start;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-around;
-  padding: 20px 0px;
-}
-
-#donation-banner-line1 {
-  font-size: 11px;
-  font-weight: bold;
-  text-transform: uppercase;
-}
-
-#donation-banner-line2 {
-  font-size: 20px;
-  font-weight: bold;
-}
-
-#donation-banner-line2 span {
-  background-color: #a9fef8;
-}
-
-#donation-banner-line3 {
-  font-size: 14px;
-}
-
-#donation-banner-button {
-  background-color: var(--abouttor-bg-toron-color);
-  border-radius: 3px;
-  border: 0px;
-  color: white;
-  font-size: 14px;
-  font-weight: bold;
-  margin: 10px 0px;
-  padding: 10px 24px;
-  text-decoration: none;
-}
-
-#donation-banner-button:hover {
-  background-color: #683d7d;
-  cursor: pointer;
-}
-
-body[show-donation-banner="false"] .torcontent-container,
-body[show-donation-banner="false"] .onion-pattern-container,
-body[show-donation-banner="false"] #torstatus-version,
-body[show-donation-banner="false"] #onboarding-overlay-button {
+body[show-tornews-banner="false"] #torstatus-version,
+body[show-tornews-banner="false"] #onboarding-overlay-button {
   transition: transform 200ms;
 }
 
-body[show-donation-banner="true"] .torcontent-container,
-body[show-donation-banner="true"] .onion-pattern-container {
-  transform: translateY(80px);
+body[show-tornews-banner="true"] #torstatus-version,
+body[show-tornews-banner="true"] #onboarding-overlay-button {
+  transform: translateY(60px);
   transition: transform 0ms;
 }
-
-body[show-donation-banner="true"] .onion-pattern-container {
-  position: fixed;
-}
-
-body[show-donation-banner="true"] #torstatus-version,
-body[show-donation-banner="true"] #onboarding-overlay-button {
-  transform: translateY(200px);
-  transition: transform 0ms;
-  position: absolute;
-}
diff --git a/src/chrome/skin/donation_banner_image_3x.png 
b/src/chrome/skin/donation_banner_image_3x.png
deleted file mode 100644
index 6eb7fbbb..00000000
Binary files a/src/chrome/skin/donation_banner_image_3x.png and /dev/null differ
diff --git a/src/chrome/skin/newsletter_3x.png 
b/src/chrome/skin/newsletter_3x.png
new file mode 100644
index 00000000..821572fa
Binary files /dev/null and b/src/chrome/skin/newsletter_3x.png differ
diff --git a/src/defaults/preferences/preferences.js 
b/src/defaults/preferences/preferences.js
index eb055a65..45b60ce8 100644
--- a/src/defaults/preferences/preferences.js
+++ b/src/defaults/preferences/preferences.js
@@ -6,7 +6,7 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 
1=errorconsole, 2=debuglo
 pref("extensions.torbutton.display_circuit", true);
 pref("[email protected]", 
"chrome://torbutton/locale/torbutton.properties");
 pref("extensions.torbutton.updateNeeded", false);
-pref("extensions.torbutton.donation_banner_countdown2", 12);
+pref("extensions.torbutton.tornews_banner_countdown", 4);
 
 // Tor check and proxy prefs
 pref("extensions.torbutton.test_enabled",true);

_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbutton/maint-2.0] Bug 29035: Post-YE campaign clean-up 2018

Reply via email to