[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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



commit fcbc57dc246ff38d7b04618ccab589c6cf33bad3
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
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("extensions.torbutton@xxxxxxxxxxxxxx.description", "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
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits