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

[tor-commits] [translation/abouttor-homepage] Partial fix for #9144

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/abouttor-homepage] Partial fix for #9144
From: translation@xxxxxxxxxxxxxx
Date: Mon, 10 Mar 2014 18:45:00 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 10 Mar 2014 14:45:43 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 48d1e0c72332a88253b6b0c05bfa31f6d7f36d3b
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Mon Mar 10 18:44:30 2014 +0000

    Partial fix for #9144
---
 af/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 ak/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 am/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 arn/aboutTor.dtd      |  102 ++++++++++++++++++++++++-------------------------
 ast/aboutTor.dtd      |   98 +++++++++++++++++++++++------------------------
 az/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 be/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 bg_BG/aboutTor.dtd    |  102 ++++++++++++++++++++++++-------------------------
 bn/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 bn_IN/aboutTor.dtd    |  102 ++++++++++++++++++++++++-------------------------
 bo/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 br/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 bs/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 csb/aboutTor.dtd      |  102 ++++++++++++++++++++++++-------------------------
 dz/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 el_GR/aboutTor.dtd    |  102 ++++++++++++++++++++++++-------------------------
 eo/aboutTor.dtd       |  100 ++++++++++++++++++++++++------------------------
 es_AR/aboutTor.dtd    |  102 ++++++++++++++++++++++++-------------------------
 es_CO/aboutTor.dtd    |  102 ++++++++++++++++++++++++-------------------------
 et/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 fil/aboutTor.dtd      |  102 ++++++++++++++++++++++++-------------------------
 fo/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 fur/aboutTor.dtd      |  102 ++++++++++++++++++++++++-------------------------
 fy/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 ga/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 gl/aboutTor.dtd       |   46 +++++++++++-----------
 gu/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 gu_IN/aboutTor.dtd    |  102 ++++++++++++++++++++++++-------------------------
 gun/aboutTor.dtd      |  102 ++++++++++++++++++++++++-------------------------
 ha/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 hi/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 hr/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 ht/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 hy/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 ia/aboutTor.dtd       |  100 ++++++++++++++++++++++++------------------------
 id/aboutTor.dtd       |   96 +++++++++++++++++++++++-----------------------
 is/aboutTor.dtd       |  100 ++++++++++++++++++++++++------------------------
 jv/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 ka/aboutTor.dtd       |   98 +++++++++++++++++++++++------------------------
 kn/aboutTor.dtd       |   90 +++++++++++++++++++++----------------------
 ko_KR/aboutTor.dtd    |   94 ++++++++++++++++++++++-----------------------
 ku/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 kw/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 ky/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 lb/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 lg/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 ln/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 lo/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 lt/aboutTor.dtd       |  100 ++++++++++++++++++++++++------------------------
 mg/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 mi/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 mk/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 ml/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 mn/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 mt/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 my/aboutTor.dtd       |   94 ++++++++++++++++++++++-----------------------
 nah/aboutTor.dtd      |  102 ++++++++++++++++++++++++-------------------------
 nap/aboutTor.dtd      |  102 ++++++++++++++++++++++++-------------------------
 nds/aboutTor.dtd      |  102 ++++++++++++++++++++++++-------------------------
 ne/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 nn/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 nso/aboutTor.dtd      |  102 ++++++++++++++++++++++++-------------------------
 oc/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 or/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 pa/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 pap/aboutTor.dtd      |  102 ++++++++++++++++++++++++-------------------------
 pms/aboutTor.dtd      |  102 ++++++++++++++++++++++++-------------------------
 ps/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 sco/aboutTor.dtd      |  102 ++++++++++++++++++++++++-------------------------
 si/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 sk_SK/aboutTor.dtd    |  102 ++++++++++++++++++++++++-------------------------
 sl/aboutTor.dtd       |  100 ++++++++++++++++++++++++------------------------
 sn/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 so/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 son/aboutTor.dtd      |  102 ++++++++++++++++++++++++-------------------------
 sq/aboutTor.dtd       |  100 ++++++++++++++++++++++++------------------------
 sr@latin/aboutTor.dtd |  102 ++++++++++++++++++++++++-------------------------
 st/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 su/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 sw/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 szl/aboutTor.dtd      |  102 ++++++++++++++++++++++++-------------------------
 te/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 te_IN/aboutTor.dtd    |  102 ++++++++++++++++++++++++-------------------------
 tg/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 ti/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 tk/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 ur/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 ur_PK/aboutTor.dtd    |  102 ++++++++++++++++++++++++-------------------------
 uz/aboutTor.dtd       |   98 +++++++++++++++++++++++------------------------
 ve/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 wa/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 wo/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 zu/aboutTor.dtd       |  102 ++++++++++++++++++++++++-------------------------
 93 files changed, 4686 insertions(+), 4686 deletions(-)

diff --git a/af/aboutTor.dtd b/af/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/af/aboutTor.dtd
+++ b/af/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/ak/aboutTor.dtd b/ak/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/ak/aboutTor.dtd
+++ b/ak/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/am/aboutTor.dtd b/am/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/am/aboutTor.dtd
+++ b/am/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/arn/aboutTor.dtd b/arn/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/arn/aboutTor.dtd
+++ b/arn/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/ast/aboutTor.dtd b/ast/aboutTor.dtd
index 1e05fb5..f9b5ab2 100644
--- a/ast/aboutTor.dtd
+++ b/ast/aboutTor.dtd
@@ -6,20 +6,20 @@
 
 <!ENTITY aboutTor.title "Tocante a Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "Guetar">
 
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/az/aboutTor.dtd b/az/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/az/aboutTor.dtd
+++ b/az/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/be/aboutTor.dtd b/be/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/be/aboutTor.dtd
+++ b/be/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/bg_BG/aboutTor.dtd b/bg_BG/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/bg_BG/aboutTor.dtd
+++ b/bg_BG/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/bn/aboutTor.dtd b/bn/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/bn/aboutTor.dtd
+++ b/bn/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/bn_IN/aboutTor.dtd b/bn_IN/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/bn_IN/aboutTor.dtd
+++ b/bn_IN/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/bo/aboutTor.dtd b/bo/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/bo/aboutTor.dtd
+++ b/bo/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/br/aboutTor.dtd b/br/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/br/aboutTor.dtd
+++ b/br/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/bs/aboutTor.dtd b/bs/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/bs/aboutTor.dtd
+++ b/bs/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/csb/aboutTor.dtd b/csb/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/csb/aboutTor.dtd
+++ b/csb/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/dz/aboutTor.dtd b/dz/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/dz/aboutTor.dtd
+++ b/dz/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/el_GR/aboutTor.dtd b/el_GR/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/el_GR/aboutTor.dtd
+++ b/el_GR/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/eo/aboutTor.dtd b/eo/aboutTor.dtd
index 9fb921b..7db833e 100644
--- a/eo/aboutTor.dtd
+++ b/eo/aboutTor.dtd
@@ -4,22 +4,22 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "SerÄ?i">
 
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/es_AR/aboutTor.dtd b/es_AR/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/es_AR/aboutTor.dtd
+++ b/es_AR/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/es_CO/aboutTor.dtd b/es_CO/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/es_CO/aboutTor.dtd
+++ b/es_CO/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/et/aboutTor.dtd b/et/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/et/aboutTor.dtd
+++ b/et/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/fil/aboutTor.dtd b/fil/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/fil/aboutTor.dtd
+++ b/fil/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/fo/aboutTor.dtd b/fo/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/fo/aboutTor.dtd
+++ b/fo/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/fur/aboutTor.dtd b/fur/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/fur/aboutTor.dtd
+++ b/fur/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/fy/aboutTor.dtd b/fy/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/fy/aboutTor.dtd
+++ b/fy/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/ga/aboutTor.dtd b/ga/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/ga/aboutTor.dtd
+++ b/ga/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/gl/aboutTor.dtd b/gl/aboutTor.dtd
index 6578ea1..45b80b8 100644
--- a/gl/aboutTor.dtd
+++ b/gl/aboutTor.dtd
@@ -4,20 +4,20 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
 <!ENTITY aboutTor.success.label "ParabÃ©ns!">
 <!ENTITY aboutTor.success2.label "Este navegador estÃ¡ configurado para empregar Tor.">
 <!ENTITY aboutTor.success3.label "Agora podes explorar internet de xeito anÃ³nimo.">
 <!ENTITY aboutTor.failure.label "Algo foi mal!">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
 <!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
 <!ENTITY aboutTor.failure3suffix.label ".">
 
@@ -32,19 +32,19 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
 <!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Buscar">
 <!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Buscar">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
 <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
 <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
 <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
 <!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
@@ -53,21 +53,21 @@
 
 <!ENTITY aboutTor.torInfo1.label "InformaciÃ³n adicional:">
 <!ENTITY aboutTor.torInfo2.label "PaÃs &amp; enderezo IP:">
-<!ENTITY aboutTor.torInfo3.label "">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
 <!ENTITY aboutTor.torInfo4.label "Este servidor non rexistra informaciÃ³n ningunha sobre os visitantes.">
-<!ENTITY aboutTor.whatnextQuestion.label "">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
 <!ENTITY aboutTor.whatnextAnswer.label "Tor NON Ã© todo o que precisas para navegares anonimamente! Podes ter que cambiar algÃºns dos teus hÃ¡bitos de navegaciÃ³n para garantires que a tÃºa identidade fica segura.">
-<!ENTITY aboutTor.whatnext.label "">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
 <!ENTITY aboutTor.helpInfo1.label "Ti podes axudar!">
 <!ENTITY aboutTor.helpInfo2.label "Hai moitas maneiras de axudares a facer a rede Tor mÃ¡is rÃ¡pida e mÃ¡is forte:">
-<!ENTITY aboutTor.helpInfo3.label "">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
 <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "">
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
 <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
 <!ENTITY aboutTor.helpInfo5.label "Realiza unha doazÃ³n Â»">
 <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
 <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/gu/aboutTor.dtd b/gu/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/gu/aboutTor.dtd
+++ b/gu/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/gu_IN/aboutTor.dtd b/gu_IN/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/gu_IN/aboutTor.dtd
+++ b/gu_IN/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/gun/aboutTor.dtd b/gun/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/gun/aboutTor.dtd
+++ b/gun/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/ha/aboutTor.dtd b/ha/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/ha/aboutTor.dtd
+++ b/ha/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/hi/aboutTor.dtd b/hi/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/hi/aboutTor.dtd
+++ b/hi/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/hr/aboutTor.dtd b/hr/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/hr/aboutTor.dtd
+++ b/hr/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/ht/aboutTor.dtd b/ht/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/ht/aboutTor.dtd
+++ b/ht/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/hy/aboutTor.dtd b/hy/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/hy/aboutTor.dtd
+++ b/hy/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/ia/aboutTor.dtd b/ia/aboutTor.dtd
index 4c22fde..5f893e3 100644
--- a/ia/aboutTor.dtd
+++ b/ia/aboutTor.dtd
@@ -4,22 +4,22 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "Cercar">
 
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/id/aboutTor.dtd b/id/aboutTor.dtd
index 3e90927..8394026 100644
--- a/id/aboutTor.dtd
+++ b/id/aboutTor.dtd
@@ -4,22 +4,22 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "Cari">
 
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
 <!ENTITY aboutTor.searchSP.search.label "Halawan awal">
 <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/is/aboutTor.dtd b/is/aboutTor.dtd
index 33ffb80..ad2d7d4 100644
--- a/is/aboutTor.dtd
+++ b/is/aboutTor.dtd
@@ -4,22 +4,22 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "Leita">
 
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/jv/aboutTor.dtd b/jv/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/jv/aboutTor.dtd
+++ b/jv/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/ka/aboutTor.dtd b/ka/aboutTor.dtd
index 16a0a73..89a33c6 100644
--- a/ka/aboutTor.dtd
+++ b/ka/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
 <!ENTITY aboutTor.searchSP.search.label "á?¡á??á?¬á?§á??á?¡á?? á??á??á??á? á??á??">
 <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/kn/aboutTor.dtd b/kn/aboutTor.dtd
index 6e3ac23..9976f19 100644
--- a/kn/aboutTor.dtd
+++ b/kn/aboutTor.dtd
@@ -8,20 +8,20 @@
 
 <!ENTITY aboutTor.outOfDateTorOn.label "à²?à²¦à²°à³?, à²? à²¬à³?à²°à³?à²¸à²°à³? à²¤à³?à²?à²¬à²¾ à²¹à²³à³?à²¦à³?.">
 <!ENTITY aboutTor.outOfDateTorOff.label "à²®à²¤à³?à²¤à³?, à²? à²¬à³?à²°à³?à²¸à²°à³? à²¤à³?à²?à²¬à²¾ à²¹à²³à³?à²¦à³?.">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
 <!ENTITY aboutTor.success.label "à²¶à³?à²à²¾à²¶à²¯à²?à²³à³?">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
 <!ENTITY aboutTor.searchSP.search.label "à²®à³?à²?à²ªà³?à²?">
 <!ENTITY aboutTor.searchDDG.search.label "à²¡à²?à³?â??à²¡à²?à³?â?? à²?à³? ">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/ko_KR/aboutTor.dtd b/ko_KR/aboutTor.dtd
index a2048e9..b757ae0 100644
--- a/ko_KR/aboutTor.dtd
+++ b/ko_KR/aboutTor.dtd
@@ -4,21 +4,21 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
 <!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "ì?´í?´ë³´ê¸°">
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
 <!ENTITY aboutTor.searchSP.search.afterLink.label ".">
 <!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/ku/aboutTor.dtd b/ku/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/ku/aboutTor.dtd
+++ b/ku/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/kw/aboutTor.dtd b/kw/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/kw/aboutTor.dtd
+++ b/kw/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/ky/aboutTor.dtd b/ky/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/ky/aboutTor.dtd
+++ b/ky/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/lb/aboutTor.dtd b/lb/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/lb/aboutTor.dtd
+++ b/lb/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/lg/aboutTor.dtd b/lg/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/lg/aboutTor.dtd
+++ b/lg/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/ln/aboutTor.dtd b/ln/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/ln/aboutTor.dtd
+++ b/ln/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/lo/aboutTor.dtd b/lo/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/lo/aboutTor.dtd
+++ b/lo/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/lt/aboutTor.dtd b/lt/aboutTor.dtd
index 4747be6..670bad1 100644
--- a/lt/aboutTor.dtd
+++ b/lt/aboutTor.dtd
@@ -4,22 +4,22 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "IeÅ¡koti">
 
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/mg/aboutTor.dtd b/mg/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/mg/aboutTor.dtd
+++ b/mg/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/mi/aboutTor.dtd b/mi/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/mi/aboutTor.dtd
+++ b/mi/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/mk/aboutTor.dtd b/mk/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/mk/aboutTor.dtd
+++ b/mk/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/ml/aboutTor.dtd b/ml/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/ml/aboutTor.dtd
+++ b/ml/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/mn/aboutTor.dtd b/mn/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/mn/aboutTor.dtd
+++ b/mn/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/mt/aboutTor.dtd b/mt/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/mt/aboutTor.dtd
+++ b/mt/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/my/aboutTor.dtd b/my/aboutTor.dtd
index 6348dc3..137e69c 100644
--- a/my/aboutTor.dtd
+++ b/my/aboutTor.dtd
@@ -4,21 +4,21 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
 <!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "á??á?¾á?¬á??á?½á?±á??á??á?º">
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
 <!ENTITY aboutTor.searchSP.search.afterLink.label ".">
 <!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/nah/aboutTor.dtd b/nah/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/nah/aboutTor.dtd
+++ b/nah/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/nap/aboutTor.dtd b/nap/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/nap/aboutTor.dtd
+++ b/nap/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/nds/aboutTor.dtd b/nds/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/nds/aboutTor.dtd
+++ b/nds/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/ne/aboutTor.dtd b/ne/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/ne/aboutTor.dtd
+++ b/ne/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/nn/aboutTor.dtd b/nn/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/nn/aboutTor.dtd
+++ b/nn/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/nso/aboutTor.dtd b/nso/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/nso/aboutTor.dtd
+++ b/nso/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/oc/aboutTor.dtd b/oc/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/oc/aboutTor.dtd
+++ b/oc/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/or/aboutTor.dtd b/or/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/or/aboutTor.dtd
+++ b/or/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/pa/aboutTor.dtd b/pa/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/pa/aboutTor.dtd
+++ b/pa/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/pap/aboutTor.dtd b/pap/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/pap/aboutTor.dtd
+++ b/pap/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/pms/aboutTor.dtd b/pms/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/pms/aboutTor.dtd
+++ b/pms/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/ps/aboutTor.dtd b/ps/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/ps/aboutTor.dtd
+++ b/ps/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/sco/aboutTor.dtd b/sco/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/sco/aboutTor.dtd
+++ b/sco/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/si/aboutTor.dtd b/si/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/si/aboutTor.dtd
+++ b/si/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/sk_SK/aboutTor.dtd b/sk_SK/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/sk_SK/aboutTor.dtd
+++ b/sk_SK/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/sl/aboutTor.dtd b/sl/aboutTor.dtd
index 679dd55..7593e71 100644
--- a/sl/aboutTor.dtd
+++ b/sl/aboutTor.dtd
@@ -4,22 +4,22 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "IÅ¡Ä?i">
 
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/sn/aboutTor.dtd b/sn/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/sn/aboutTor.dtd
+++ b/sn/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/so/aboutTor.dtd b/so/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/so/aboutTor.dtd
+++ b/so/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/son/aboutTor.dtd b/son/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/son/aboutTor.dtd
+++ b/son/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/sq/aboutTor.dtd b/sq/aboutTor.dtd
index f97c58c..f7b6a68 100644
--- a/sq/aboutTor.dtd
+++ b/sq/aboutTor.dtd
@@ -4,22 +4,22 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "KÃ«rko">
 
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/sr@latin/aboutTor.dtd b/sr@latin/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/sr@latin/aboutTor.dtd
+++ b/sr@latin/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/st/aboutTor.dtd b/st/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/st/aboutTor.dtd
+++ b/st/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/su/aboutTor.dtd b/su/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/su/aboutTor.dtd
+++ b/su/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/sw/aboutTor.dtd b/sw/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/sw/aboutTor.dtd
+++ b/sw/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/szl/aboutTor.dtd b/szl/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/szl/aboutTor.dtd
+++ b/szl/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/te/aboutTor.dtd b/te/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/te/aboutTor.dtd
+++ b/te/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/te_IN/aboutTor.dtd b/te_IN/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/te_IN/aboutTor.dtd
+++ b/te_IN/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/tg/aboutTor.dtd b/tg/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/tg/aboutTor.dtd
+++ b/tg/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/ti/aboutTor.dtd b/ti/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/ti/aboutTor.dtd
+++ b/ti/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/tk/aboutTor.dtd b/tk/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/tk/aboutTor.dtd
+++ b/tk/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/ur/aboutTor.dtd b/ur/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/ur/aboutTor.dtd
+++ b/ur/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/ur_PK/aboutTor.dtd b/ur_PK/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/ur_PK/aboutTor.dtd
+++ b/ur_PK/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/uz/aboutTor.dtd b/uz/aboutTor.dtd
index 19ae51b..d6876ab 100644
--- a/uz/aboutTor.dtd
+++ b/uz/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
 <!ENTITY aboutTor.searchSP.search.label "Bosh sahifa">
 <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/ve/aboutTor.dtd b/ve/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/ve/aboutTor.dtd
+++ b/ve/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/wa/aboutTor.dtd b/wa/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/wa/aboutTor.dtd
+++ b/wa/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/wo/aboutTor.dtd b/wo/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/wo/aboutTor.dtd
+++ b/wo/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/zu/aboutTor.dtd b/zu/aboutTor.dtd
index da2703e..c1483a8 100644
--- a/zu/aboutTor.dtd
+++ b/zu/aboutTor.dtd
@@ -4,24 +4,24 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "">
+<!ENTITY aboutTor.title "About Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "">
-<!ENTITY aboutTor.outOfDateTorOff.label "">
-<!ENTITY aboutTor.outOfDate2.label "">
+<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
 
-<!ENTITY aboutTor.check.label "">
+<!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
-<!ENTITY aboutTor.success.label "">
-<!ENTITY aboutTor.success2.label "">
-<!ENTITY aboutTor.success3.label "">
-<!ENTITY aboutTor.failure.label "">
-<!ENTITY aboutTor.failure2.label "">
-<!ENTITY aboutTor.failure3prefix.label "">
-<!ENTITY aboutTor.failure3Link "">
-<!ENTITY aboutTor.failure3suffix.label "">
+<!ENTITY aboutTor.success.label "Congratulations!">
+<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
+<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
+<!ENTITY aboutTor.failure.label "Something Went Wrong!">
+<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
+<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
+<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
+<!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "">
+<!ENTITY aboutTor.search.label "Search">
 
 <!-- Note to translators: the following 18 entities are used to construct a
    - sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
    - The sentence contains two embedded links for "securely" and
    - the search engine ("Startpage" or "DuckDuckGo").
   -->
-<!ENTITY aboutTor.searchSPPost.link "">
-<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
+<!ENTITY aboutTor.searchSP.privacy.label "securely">
+<!ENTITY aboutTor.searchDDG.privacy.label "securely">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html";>
+<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html";>
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
+<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
+<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
+<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "">
-<!ENTITY aboutTor.torInfo2.label "">
-<!ENTITY aboutTor.torInfo3.label "">
-<!ENTITY aboutTor.torInfo4.label "">
-<!ENTITY aboutTor.whatnextQuestion.label "">
-<!ENTITY aboutTor.whatnextAnswer.label "">
-<!ENTITY aboutTor.whatnext.label "">
-<!ENTITY aboutTor.whatnext.link "">
-<!ENTITY aboutTor.helpInfo1.label "">
-<!ENTITY aboutTor.helpInfo2.label "">
-<!ENTITY aboutTor.helpInfo3.label "">
-<!ENTITY aboutTor.helpInfo3.link "">
-<!ENTITY aboutTor.helpInfo4.label "">
-<!ENTITY aboutTor.helpInfo4.link "">
-<!ENTITY aboutTor.helpInfo5.label "">
-<!ENTITY aboutTor.helpInfo5.link "">
+<!ENTITY aboutTor.torInfo1.label "Additional Info:">
+<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
+<!ENTITY aboutTor.torInfo3.label "Exit Node:">
+<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
+<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
+<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
+<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
+<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
+<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
+<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
+<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "">
-<!ENTITY aboutTor.learnMore.label "">
-<!ENTITY aboutTor.learnMore.link "">
+<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
Next by Author: [tor-commits] [translation/torcheck] Update translations for torcheck
Previous by thread: [tor-commits] [tor-launcher/master] Bug #10418: Use Sentence case for radio button labels.
Next by thread: [tor-commits] [translation/https_everywhere] Partial fix for #9144
Index(es):
- Author
- Thread