[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

translation at torproject.org translation at torproject.org
Sun Mar 30 09:17:06 UTC 2014


commit 610c5b88505d2a1ef2a4040532c935bc143a4878
Author: Translation commit bot <translation at torproject.org>
Date:   Sun Mar 30 09:17:03 2014 +0000

    Update translations for abouttor-homepage
---
 ach/aboutTor.dtd         |   27 +--------------------------
 ady/aboutTor.dtd         |   27 +--------------------------
 af/aboutTor.dtd          |   27 +--------------------------
 af_ZA/aboutTor.dtd       |   27 +--------------------------
 ak/aboutTor.dtd          |   27 +--------------------------
 am/aboutTor.dtd          |   27 +--------------------------
 ar/aboutTor.dtd          |   27 +--------------------------
 arn/aboutTor.dtd         |   27 +--------------------------
 ast/aboutTor.dtd         |   27 +--------------------------
 az/aboutTor.dtd          |   27 +--------------------------
 be/aboutTor.dtd          |   27 +--------------------------
 bg/aboutTor.dtd          |   27 +--------------------------
 bg_BG/aboutTor.dtd       |   27 +--------------------------
 bn/aboutTor.dtd          |   27 +--------------------------
 bn_BD/aboutTor.dtd       |   27 +--------------------------
 bn_IN/aboutTor.dtd       |   27 +--------------------------
 bo/aboutTor.dtd          |   27 +--------------------------
 br/aboutTor.dtd          |   27 +--------------------------
 bs/aboutTor.dtd          |   27 +--------------------------
 ca/aboutTor.dtd          |   27 +--------------------------
 cs/aboutTor.dtd          |   27 +--------------------------
 cs_CZ/aboutTor.dtd       |   27 +--------------------------
 csb/aboutTor.dtd         |   27 +--------------------------
 cv/aboutTor.dtd          |   27 +--------------------------
 cy/aboutTor.dtd          |   27 +--------------------------
 da/aboutTor.dtd          |   27 +--------------------------
 de/aboutTor.dtd          |   27 +--------------------------
 dz/aboutTor.dtd          |   27 +--------------------------
 el/aboutTor.dtd          |   27 +--------------------------
 el_GR/aboutTor.dtd       |   27 +--------------------------
 en/aboutTor.dtd          |   27 +--------------------------
 en_GB/aboutTor.dtd       |   27 +--------------------------
 eo/aboutTor.dtd          |   27 +--------------------------
 es/aboutTor.dtd          |   27 +--------------------------
 es_AR/aboutTor.dtd       |   27 +--------------------------
 es_CL/aboutTor.dtd       |   27 +--------------------------
 es_CO/aboutTor.dtd       |   27 +--------------------------
 es_MX/aboutTor.dtd       |   27 +--------------------------
 es_NI/aboutTor.dtd       |   27 +--------------------------
 et/aboutTor.dtd          |   27 +--------------------------
 eu/aboutTor.dtd          |   27 +--------------------------
 fa/aboutTor.dtd          |   27 +--------------------------
 fi/aboutTor.dtd          |   27 +--------------------------
 fil/aboutTor.dtd         |   27 +--------------------------
 fo/aboutTor.dtd          |   27 +--------------------------
 fr/aboutTor.dtd          |   27 +--------------------------
 fr_CA/aboutTor.dtd       |   27 +--------------------------
 fur/aboutTor.dtd         |   27 +--------------------------
 fy/aboutTor.dtd          |   27 +--------------------------
 ga/aboutTor.dtd          |   27 +--------------------------
 gl/aboutTor.dtd          |   27 +--------------------------
 gu/aboutTor.dtd          |   27 +--------------------------
 gu_IN/aboutTor.dtd       |   27 +--------------------------
 gun/aboutTor.dtd         |   27 +--------------------------
 ha/aboutTor.dtd          |   27 +--------------------------
 he/aboutTor.dtd          |   27 +--------------------------
 hi/aboutTor.dtd          |   27 +--------------------------
 hr/aboutTor.dtd          |   27 +--------------------------
 hr_HR/aboutTor.dtd       |   27 +--------------------------
 ht/aboutTor.dtd          |   27 +--------------------------
 hu/aboutTor.dtd          |   27 +--------------------------
 hy/aboutTor.dtd          |   27 +--------------------------
 hy_AM/aboutTor.dtd       |   27 +--------------------------
 ia/aboutTor.dtd          |   27 +--------------------------
 id/aboutTor.dtd          |   27 +--------------------------
 is/aboutTor.dtd          |   27 +--------------------------
 it/aboutTor.dtd          |   27 +--------------------------
 ja/aboutTor.dtd          |   27 +--------------------------
 jv/aboutTor.dtd          |   27 +--------------------------
 ka/aboutTor.dtd          |   27 +--------------------------
 kk/aboutTor.dtd          |   27 +--------------------------
 km/aboutTor.dtd          |   27 +--------------------------
 kn/aboutTor.dtd          |   27 +--------------------------
 ko/aboutTor.dtd          |   27 +--------------------------
 ko_KR/aboutTor.dtd       |   27 +--------------------------
 ku/aboutTor.dtd          |   27 +--------------------------
 kw/aboutTor.dtd          |   27 +--------------------------
 ky/aboutTor.dtd          |   27 +--------------------------
 lb/aboutTor.dtd          |   27 +--------------------------
 lg/aboutTor.dtd          |   27 +--------------------------
 ln/aboutTor.dtd          |   27 +--------------------------
 lo/aboutTor.dtd          |   27 +--------------------------
 lt/aboutTor.dtd          |   27 +--------------------------
 lv/aboutTor.dtd          |   27 +--------------------------
 mg/aboutTor.dtd          |   27 +--------------------------
 mi/aboutTor.dtd          |   27 +--------------------------
 mk/aboutTor.dtd          |   27 +--------------------------
 ml/aboutTor.dtd          |   27 +--------------------------
 mn/aboutTor.dtd          |   27 +--------------------------
 mr/aboutTor.dtd          |   27 +--------------------------
 ms_MY/aboutTor.dtd       |   27 +--------------------------
 mt/aboutTor.dtd          |   27 +--------------------------
 my/aboutTor.dtd          |   27 +--------------------------
 nah/aboutTor.dtd         |   27 +--------------------------
 nap/aboutTor.dtd         |   27 +--------------------------
 nb/aboutTor.dtd          |   27 +--------------------------
 nds/aboutTor.dtd         |   27 +--------------------------
 ne/aboutTor.dtd          |   27 +--------------------------
 nl/aboutTor.dtd          |   27 +--------------------------
 nl_BE/aboutTor.dtd       |   27 +--------------------------
 nn/aboutTor.dtd          |   27 +--------------------------
 nso/aboutTor.dtd         |   27 +--------------------------
 oc/aboutTor.dtd          |   27 +--------------------------
 or/aboutTor.dtd          |   27 +--------------------------
 pa/aboutTor.dtd          |   27 +--------------------------
 pap/aboutTor.dtd         |   27 +--------------------------
 pl/aboutTor.dtd          |   27 +--------------------------
 pms/aboutTor.dtd         |   27 +--------------------------
 ps/aboutTor.dtd          |   27 +--------------------------
 pt/aboutTor.dtd          |   27 +--------------------------
 pt_BR/aboutTor.dtd       |   27 +--------------------------
 ro/aboutTor.dtd          |   27 +--------------------------
 ru/aboutTor.dtd          |   27 +--------------------------
 ru at petr1708/aboutTor.dtd |   27 +--------------------------
 sco/aboutTor.dtd         |   27 +--------------------------
 si/aboutTor.dtd          |   27 +--------------------------
 si_LK/aboutTor.dtd       |   27 +--------------------------
 sk/aboutTor.dtd          |   27 +--------------------------
 sk_SK/aboutTor.dtd       |   27 +--------------------------
 sl/aboutTor.dtd          |   27 +--------------------------
 sl_SI/aboutTor.dtd       |   27 +--------------------------
 sn/aboutTor.dtd          |   27 +--------------------------
 so/aboutTor.dtd          |   27 +--------------------------
 son/aboutTor.dtd         |   27 +--------------------------
 sq/aboutTor.dtd          |   27 +--------------------------
 sq_AL/aboutTor.dtd       |   27 +--------------------------
 sr/aboutTor.dtd          |   27 +--------------------------
 sr at latin/aboutTor.dtd    |   27 +--------------------------
 st/aboutTor.dtd          |   27 +--------------------------
 su/aboutTor.dtd          |   27 +--------------------------
 sv/aboutTor.dtd          |   27 +--------------------------
 sw/aboutTor.dtd          |   27 +--------------------------
 szl/aboutTor.dtd         |   27 +--------------------------
 ta/aboutTor.dtd          |   27 +--------------------------
 te/aboutTor.dtd          |   27 +--------------------------
 te_IN/aboutTor.dtd       |   27 +--------------------------
 tg/aboutTor.dtd          |   27 +--------------------------
 th/aboutTor.dtd          |   27 +--------------------------
 ti/aboutTor.dtd          |   27 +--------------------------
 tk/aboutTor.dtd          |   27 +--------------------------
 tr/aboutTor.dtd          |   27 +--------------------------
 uk/aboutTor.dtd          |   27 +--------------------------
 ur/aboutTor.dtd          |   27 +--------------------------
 ur_PK/aboutTor.dtd       |   27 +--------------------------
 uz/aboutTor.dtd          |   27 +--------------------------
 ve/aboutTor.dtd          |   27 +--------------------------
 vi/aboutTor.dtd          |   27 +--------------------------
 wa/aboutTor.dtd          |   27 +--------------------------
 wo/aboutTor.dtd          |   27 +--------------------------
 zh_CN/aboutTor.dtd       |   27 +--------------------------
 zh_HK/aboutTor.dtd       |   27 +--------------------------
 zh_TW/aboutTor.dtd       |   27 +--------------------------
 zu/aboutTor.dtd          |   27 +--------------------------
 153 files changed, 153 insertions(+), 3978 deletions(-)

diff --git a/ach/aboutTor.dtd b/ach/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/ach/aboutTor.dtd
+++ b/ach/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ady/aboutTor.dtd b/ady/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/ady/aboutTor.dtd
+++ b/ady/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/af/aboutTor.dtd b/af/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/af/aboutTor.dtd
+++ b/af/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/af_ZA/aboutTor.dtd b/af_ZA/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/af_ZA/aboutTor.dtd
+++ b/af_ZA/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ak/aboutTor.dtd b/ak/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/ak/aboutTor.dtd
+++ b/ak/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/am/aboutTor.dtd b/am/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/am/aboutTor.dtd
+++ b/am/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ar/aboutTor.dtd b/ar/aboutTor.dtd
index 8b0d7cf..e02388f 100644
--- a/ar/aboutTor.dtd
+++ b/ar/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "بحث">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!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 "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "مع">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "مع">
-<!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 "الدولة وعنوان الإنترنت:">
diff --git a/arn/aboutTor.dtd b/arn/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/arn/aboutTor.dtd
+++ b/arn/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ast/aboutTor.dtd b/ast/aboutTor.dtd
index f9b5ab2..ead1eae 100644
--- a/ast/aboutTor.dtd
+++ b/ast/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Guetar">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/az/aboutTor.dtd b/az/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/az/aboutTor.dtd
+++ b/az/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/be/aboutTor.dtd b/be/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/be/aboutTor.dtd
+++ b/be/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/bg/aboutTor.dtd b/bg/aboutTor.dtd
index 4f9c99b..e18af5d 100644
--- a/bg/aboutTor.dtd
+++ b/bg/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Търси">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!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 "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "с">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "с">
-<!ENTITY aboutTor.searchSP.search.label "Начална страница">
-<!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 "Държава и IP адрес:">
diff --git a/bg_BG/aboutTor.dtd b/bg_BG/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/bg_BG/aboutTor.dtd
+++ b/bg_BG/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/bn/aboutTor.dtd b/bn/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/bn/aboutTor.dtd
+++ b/bn/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/bn_BD/aboutTor.dtd b/bn_BD/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/bn_BD/aboutTor.dtd
+++ b/bn_BD/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/bn_IN/aboutTor.dtd b/bn_IN/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/bn_IN/aboutTor.dtd
+++ b/bn_IN/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/bo/aboutTor.dtd b/bo/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/bo/aboutTor.dtd
+++ b/bo/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/br/aboutTor.dtd b/br/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/br/aboutTor.dtd
+++ b/br/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/bs/aboutTor.dtd b/bs/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/bs/aboutTor.dtd
+++ b/bs/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ca/aboutTor.dtd b/ca/aboutTor.dtd
index b8e8564..9f0a79a 100644
--- a/ca/aboutTor.dtd
+++ b/ca/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Recerca">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Cerca">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Cerca">
-<!ENTITY aboutTor.searchSP.privacy.label "assegurat">
-<!ENTITY aboutTor.searchDDG.privacy.label "assegurat">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "amb">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "amb">
-<!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 "Més informació:">
 <!ENTITY aboutTor.torInfo2.label "Estat i Adreça IP:">
diff --git a/cs/aboutTor.dtd b/cs/aboutTor.dtd
index b734914..1fb5e14 100644
--- a/cs/aboutTor.dtd
+++ b/cs/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Hledat">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Hledat">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Hledat">
-<!ENTITY aboutTor.searchSP.privacy.label "bezpečně">
-<!ENTITY aboutTor.searchDDG.privacy.label "bezpečně">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "s">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "s">
-<!ENTITY aboutTor.searchSP.search.label "Úvodní stránka">
-<!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 "Další informace:">
 <!ENTITY aboutTor.torInfo2.label "Stát a IP adresa:">
diff --git a/cs_CZ/aboutTor.dtd b/cs_CZ/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/cs_CZ/aboutTor.dtd
+++ b/cs_CZ/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/csb/aboutTor.dtd b/csb/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/csb/aboutTor.dtd
+++ b/csb/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/cv/aboutTor.dtd b/cv/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/cv/aboutTor.dtd
+++ b/cv/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/cy/aboutTor.dtd b/cy/aboutTor.dtd
index 2fb9323..8706e78 100644
--- a/cy/aboutTor.dtd
+++ b/cy/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Chwilio">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Chwilio ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Chwilio ">
-<!ENTITY aboutTor.searchSP.privacy.label "yn ddiogel">
-<!ENTITY aboutTor.searchDDG.privacy.label "yn ddiogel">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "gyda ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "gyda ">
-<!ENTITY aboutTor.searchSP.search.label "Tudalen cartref">
-<!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 "Gwybodaeth ychwanegol: ">
 <!ENTITY aboutTor.torInfo2.label "Gwlad a chyfeiriad IP:">
diff --git a/da/aboutTor.dtd b/da/aboutTor.dtd
index 5a9f821..7c4b1a7 100644
--- a/da/aboutTor.dtd
+++ b/da/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Søg">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Søg">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Søg">
-<!ENTITY aboutTor.searchSP.privacy.label "sikkert">
-<!ENTITY aboutTor.searchDDG.privacy.label "sikkert">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "med">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "med">
-<!ENTITY aboutTor.searchSP.search.label "Startside">
-<!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 "Yderligere information:">
 <!ENTITY aboutTor.torInfo2.label "Land og IP Adresse:">
diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd
index 1be9ede..c517faa 100644
--- a/de/aboutTor.dtd
+++ b/de/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Suche">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Suche">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Suche">
-<!ENTITY aboutTor.searchSP.privacy.label "sicher">
-<!ENTITY aboutTor.searchDDG.privacy.label "sicher">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/deu/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "mit ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "mit ">
-<!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 "Zusätzliche Informationen:">
 <!ENTITY aboutTor.torInfo2.label "Land & IP-Adresse:">
diff --git a/dz/aboutTor.dtd b/dz/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/dz/aboutTor.dtd
+++ b/dz/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/el/aboutTor.dtd b/el/aboutTor.dtd
index 5507dfc..762eeda 100644
--- a/el/aboutTor.dtd
+++ b/el/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Αναζήτηση">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!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 "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "με">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "με">
-<!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 "Χώρα & Διεύθυνση IP:">
diff --git a/el_GR/aboutTor.dtd b/el_GR/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/el_GR/aboutTor.dtd
+++ b/el_GR/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/en/aboutTor.dtd b/en/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/en/aboutTor.dtd
+++ b/en/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/en_GB/aboutTor.dtd b/en_GB/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/en_GB/aboutTor.dtd
+++ b/en_GB/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/eo/aboutTor.dtd b/eo/aboutTor.dtd
index aefc9f0..6257f9e 100644
--- a/eo/aboutTor.dtd
+++ b/eo/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Serĉi">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/es/aboutTor.dtd b/es/aboutTor.dtd
index 57f24f7..af9ff47 100644
--- a/es/aboutTor.dtd
+++ b/es/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Buscar">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Busque">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Busque">
-<!ENTITY aboutTor.searchSP.privacy.label "con seguridad">
-<!ENTITY aboutTor.searchDDG.privacy.label "con seguridad">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/esp/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "con">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "con">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/esp">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
 <!ENTITY aboutTor.torInfo1.label "Información adicional:">
 <!ENTITY aboutTor.torInfo2.label "País y dirección IP:">
diff --git a/es_AR/aboutTor.dtd b/es_AR/aboutTor.dtd
index 7897f7b..447f9a8 100644
--- a/es_AR/aboutTor.dtd
+++ b/es_AR/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Búsqueda">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Búsqueda">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Búsqueda">
-<!ENTITY aboutTor.searchSP.privacy.label "privada">
-<!ENTITY aboutTor.searchDDG.privacy.label "privada">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "con ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "con">
-<!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 "Informaciòn Adicional:">
 <!ENTITY aboutTor.torInfo2.label "País y direccion IP">
diff --git a/es_CL/aboutTor.dtd b/es_CL/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/es_CL/aboutTor.dtd
+++ b/es_CL/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/es_CO/aboutTor.dtd b/es_CO/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/es_CO/aboutTor.dtd
+++ b/es_CO/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/es_MX/aboutTor.dtd b/es_MX/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/es_MX/aboutTor.dtd
+++ b/es_MX/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/es_NI/aboutTor.dtd b/es_NI/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/es_NI/aboutTor.dtd
+++ b/es_NI/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/et/aboutTor.dtd b/et/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/et/aboutTor.dtd
+++ b/et/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/eu/aboutTor.dtd b/eu/aboutTor.dtd
index 7b07102..7afe64b 100644
--- a/eu/aboutTor.dtd
+++ b/eu/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Bilatu">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Bilatu">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Bilatu">
-<!ENTITY aboutTor.searchSP.privacy.label "segurtasunez">
-<!ENTITY aboutTor.searchDDG.privacy.label "segurtasunez">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "rekin">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "rekin">
-<!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 "Informazio gehiago:">
 <!ENTITY aboutTor.torInfo2.label "Herrialde eta IP helbidea:">
diff --git a/fa/aboutTor.dtd b/fa/aboutTor.dtd
index b8f8058..e0768d3 100644
--- a/fa/aboutTor.dtd
+++ b/fa/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "جستجو">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!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 "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "با">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "با">
-<!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 "كشور و آدرس آى پی:">
diff --git a/fi/aboutTor.dtd b/fi/aboutTor.dtd
index 3b9ce25..dc895fd 100644
--- a/fi/aboutTor.dtd
+++ b/fi/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Hae">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Hae">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Hae">
-<!ENTITY aboutTor.searchSP.privacy.label "turvallisesti">
-<!ENTITY aboutTor.searchDDG.privacy.label "turvallisesti">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
-<!ENTITY aboutTor.searchSP.search.label "Aloitussivu">
-<!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 "Lisätietoa:">
 <!ENTITY aboutTor.torInfo2.label "Maa ja IP-osoite:">
diff --git a/fil/aboutTor.dtd b/fil/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/fil/aboutTor.dtd
+++ b/fil/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/fo/aboutTor.dtd b/fo/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/fo/aboutTor.dtd
+++ b/fo/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/fr/aboutTor.dtd b/fr/aboutTor.dtd
index a0b041b..41ad3e5 100644
--- a/fr/aboutTor.dtd
+++ b/fr/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Rechercher">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Rechercher ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Rechercher ">
-<!ENTITY aboutTor.searchSP.privacy.label "en toute sécurité">
-<!ENTITY aboutTor.searchDDG.privacy.label "en toute sécurité">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "avec ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "avec ">
-<!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 "Informations supplémentaires :">
 <!ENTITY aboutTor.torInfo2.label "Pays & adresse IP :">
diff --git a/fr_CA/aboutTor.dtd b/fr_CA/aboutTor.dtd
index 908191d..3683607 100644
--- a/fr_CA/aboutTor.dtd
+++ b/fr_CA/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Rechercher">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Rechercher">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Rechercher">
-<!ENTITY aboutTor.searchSP.privacy.label "en toute sécurité">
-<!ENTITY aboutTor.searchDDG.privacy.label "en toute sécurité">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "avec">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "avec">
-<!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 "Informations supplémentaires :">
 <!ENTITY aboutTor.torInfo2.label "Pays & adresse IP :">
diff --git a/fur/aboutTor.dtd b/fur/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/fur/aboutTor.dtd
+++ b/fur/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/fy/aboutTor.dtd b/fy/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/fy/aboutTor.dtd
+++ b/fy/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ga/aboutTor.dtd b/ga/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/ga/aboutTor.dtd
+++ b/ga/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/gl/aboutTor.dtd b/gl/aboutTor.dtd
index 45b80b8..c2e0fea 100644
--- a/gl/aboutTor.dtd
+++ b/gl/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Buscar">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Información adicional:">
 <!ENTITY aboutTor.torInfo2.label "País & enderezo IP:">
diff --git a/gu/aboutTor.dtd b/gu/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/gu/aboutTor.dtd
+++ b/gu/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/gu_IN/aboutTor.dtd b/gu_IN/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/gu_IN/aboutTor.dtd
+++ b/gu_IN/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/gun/aboutTor.dtd b/gun/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/gun/aboutTor.dtd
+++ b/gun/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ha/aboutTor.dtd b/ha/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/ha/aboutTor.dtd
+++ b/ha/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/he/aboutTor.dtd b/he/aboutTor.dtd
index bc36b0d..545dbdd 100644
--- a/he/aboutTor.dtd
+++ b/he/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "חפש">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!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 "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "עם">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "עם">
-<!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 "מדינה וכתובת IP:">
diff --git a/hi/aboutTor.dtd b/hi/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/hi/aboutTor.dtd
+++ b/hi/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/hr/aboutTor.dtd b/hr/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/hr/aboutTor.dtd
+++ b/hr/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/hr_HR/aboutTor.dtd b/hr_HR/aboutTor.dtd
index 70f34e7..322b651 100644
--- a/hr_HR/aboutTor.dtd
+++ b/hr_HR/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Pretraga">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Pretraživanje">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Pretraživanje">
-<!ENTITY aboutTor.searchSP.privacy.label "sigurno">
-<!ENTITY aboutTor.searchDDG.privacy.label "sigurno">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "s">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "s">
-<!ENTITY aboutTor.searchSP.search.label "Početna stranica">
-<!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 "Dodatne informacije:">
 <!ENTITY aboutTor.torInfo2.label "Država i IP Adresa:">
diff --git a/ht/aboutTor.dtd b/ht/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/ht/aboutTor.dtd
+++ b/ht/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/hu/aboutTor.dtd b/hu/aboutTor.dtd
index 4f885c5..1adec38 100644
--- a/hu/aboutTor.dtd
+++ b/hu/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Keresés">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Keresés">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Keresés">
-<!ENTITY aboutTor.searchSP.privacy.label "biztonságosan">
-<!ENTITY aboutTor.searchDDG.privacy.label "biztonságosan">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "vele">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "vele">
-<!ENTITY aboutTor.searchSP.search.label "Kezdőlap">
-<!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 "További infó:">
 <!ENTITY aboutTor.torInfo2.label "Ország & IP cím:">
diff --git a/hy/aboutTor.dtd b/hy/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/hy/aboutTor.dtd
+++ b/hy/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/hy_AM/aboutTor.dtd b/hy_AM/aboutTor.dtd
index d91e958..7128bb8 100644
--- a/hy_AM/aboutTor.dtd
+++ b/hy_AM/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ia/aboutTor.dtd b/ia/aboutTor.dtd
index 5f893e3..13d71d4 100644
--- a/ia/aboutTor.dtd
+++ b/ia/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Cercar">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/id/aboutTor.dtd b/id/aboutTor.dtd
index c2472d2..7926211 100644
--- a/id/aboutTor.dtd
+++ b/id/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Cari">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Cari">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Cari">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/is/aboutTor.dtd b/is/aboutTor.dtd
index 9d59bfc..b4b99a1 100644
--- a/is/aboutTor.dtd
+++ b/is/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Leita">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
-<!ENTITY aboutTor.searchSP.search.label "Upphafssíða">
-<!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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/it/aboutTor.dtd b/it/aboutTor.dtd
index e9a4257..09e2064 100644
--- a/it/aboutTor.dtd
+++ b/it/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Cerca">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Cerca">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Cerca">
-<!ENTITY aboutTor.searchSP.privacy.label "in modo sicuro">
-<!ENTITY aboutTor.searchDDG.privacy.label "in modo sicuro">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/ita/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "con">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "con">
-<!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 "Ulteriori Info:">
 <!ENTITY aboutTor.torInfo2.label "Nazione & Indirizzo IP:">
diff --git a/ja/aboutTor.dtd b/ja/aboutTor.dtd
index c211960..cf272b4 100644
--- a/ja/aboutTor.dtd
+++ b/ja/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "検索">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!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 "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "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 "国とIPアドレス:">
diff --git a/jv/aboutTor.dtd b/jv/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/jv/aboutTor.dtd
+++ b/jv/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ka/aboutTor.dtd b/ka/aboutTor.dtd
index 89a33c6..7128bb8 100644
--- a/ka/aboutTor.dtd
+++ b/ka/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/kk/aboutTor.dtd b/kk/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/kk/aboutTor.dtd
+++ b/kk/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/km/aboutTor.dtd b/km/aboutTor.dtd
index 24c4ba5..af5be67 100644
--- a/km/aboutTor.dtd
+++ b/km/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "ស្វែងរក">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!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 "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "ជាមួយ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "ជា​មួយ">
-<!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 "ប្រទេស & អាសយដ្ឋាន IP៖">
diff --git a/kn/aboutTor.dtd b/kn/aboutTor.dtd
index 9976f19..38e3065 100644
--- a/kn/aboutTor.dtd
+++ b/kn/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ko/aboutTor.dtd b/ko/aboutTor.dtd
index 380725f..25b60b0 100644
--- a/ko/aboutTor.dtd
+++ b/ko/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "검색">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!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 "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "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 "국가 & IP 주소 :">
diff --git a/ko_KR/aboutTor.dtd b/ko_KR/aboutTor.dtd
index b757ae0..b2e00c3 100644
--- a/ko_KR/aboutTor.dtd
+++ b/ko_KR/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "살펴보기">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ku/aboutTor.dtd b/ku/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/ku/aboutTor.dtd
+++ b/ku/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/kw/aboutTor.dtd b/kw/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/kw/aboutTor.dtd
+++ b/kw/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ky/aboutTor.dtd b/ky/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/ky/aboutTor.dtd
+++ b/ky/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/lb/aboutTor.dtd b/lb/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/lb/aboutTor.dtd
+++ b/lb/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/lg/aboutTor.dtd b/lg/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/lg/aboutTor.dtd
+++ b/lg/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ln/aboutTor.dtd b/ln/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/ln/aboutTor.dtd
+++ b/ln/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/lo/aboutTor.dtd b/lo/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/lo/aboutTor.dtd
+++ b/lo/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/lt/aboutTor.dtd b/lt/aboutTor.dtd
index 670bad1..84b0324 100644
--- a/lt/aboutTor.dtd
+++ b/lt/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Ieškoti">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/lv/aboutTor.dtd b/lv/aboutTor.dtd
index 7dc0e57..24e9f81 100644
--- a/lv/aboutTor.dtd
+++ b/lv/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Meklēt">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Meklēt">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Meklēt">
-<!ENTITY aboutTor.searchSP.privacy.label "droši">
-<!ENTITY aboutTor.searchDDG.privacy.label "droši">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "ar">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "ar">
-<!ENTITY aboutTor.searchSP.search.label "Sākumlapa">
-<!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 "Papildu informācija:">
 <!ENTITY aboutTor.torInfo2.label "Valsts un IP adrese:">
diff --git a/mg/aboutTor.dtd b/mg/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/mg/aboutTor.dtd
+++ b/mg/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/mi/aboutTor.dtd b/mi/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/mi/aboutTor.dtd
+++ b/mi/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/mk/aboutTor.dtd b/mk/aboutTor.dtd
index f49eaab..dfef391 100644
--- a/mk/aboutTor.dtd
+++ b/mk/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ml/aboutTor.dtd b/ml/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/ml/aboutTor.dtd
+++ b/ml/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/mn/aboutTor.dtd b/mn/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/mn/aboutTor.dtd
+++ b/mn/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/mr/aboutTor.dtd b/mr/aboutTor.dtd
index dac24f6..e9fc80b 100644
--- a/mr/aboutTor.dtd
+++ b/mr/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "शोध">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ms_MY/aboutTor.dtd b/ms_MY/aboutTor.dtd
index b9c687e..6d7c3e9 100644
--- a/ms_MY/aboutTor.dtd
+++ b/ms_MY/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Carian">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Carian">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Carian">
-<!ENTITY aboutTor.searchSP.privacy.label "selamat">
-<!ENTITY aboutTor.searchDDG.privacy.label "selamat">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "dengan">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "dengan">
-<!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 "Maklumat tambahan:">
 <!ENTITY aboutTor.torInfo2.label "Negara & Alamat IP:">
diff --git a/mt/aboutTor.dtd b/mt/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/mt/aboutTor.dtd
+++ b/mt/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/my/aboutTor.dtd b/my/aboutTor.dtd
index 137e69c..bdfd2d9 100644
--- a/my/aboutTor.dtd
+++ b/my/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "ရှာဖွေရန်">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/nah/aboutTor.dtd b/nah/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/nah/aboutTor.dtd
+++ b/nah/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/nap/aboutTor.dtd b/nap/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/nap/aboutTor.dtd
+++ b/nap/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/nb/aboutTor.dtd b/nb/aboutTor.dtd
index 35f8848..5ccfe39 100644
--- a/nb/aboutTor.dtd
+++ b/nb/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Søk">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Søk">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Søk">
-<!ENTITY aboutTor.searchSP.privacy.label "sikkert">
-<!ENTITY aboutTor.searchDDG.privacy.label "sikkert">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "med">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "med">
-<!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 "Tilleggsinformasjon:">
 <!ENTITY aboutTor.torInfo2.label "Land & IP-adresse:">
diff --git a/nds/aboutTor.dtd b/nds/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/nds/aboutTor.dtd
+++ b/nds/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ne/aboutTor.dtd b/ne/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/ne/aboutTor.dtd
+++ b/ne/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/nl/aboutTor.dtd b/nl/aboutTor.dtd
index fd73f07..980ac35 100644
--- a/nl/aboutTor.dtd
+++ b/nl/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Zoeken">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Zoeken">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Zoeken">
-<!ENTITY aboutTor.searchSP.privacy.label "veilig">
-<!ENTITY aboutTor.searchDDG.privacy.label "veilig">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/ned/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "met">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "met">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "Startpage">
-<!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 "Bijkomende informatie:">
 <!ENTITY aboutTor.torInfo2.label "Land & IP Adres:">
diff --git a/nl_BE/aboutTor.dtd b/nl_BE/aboutTor.dtd
index fd73f07..980ac35 100644
--- a/nl_BE/aboutTor.dtd
+++ b/nl_BE/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Zoeken">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Zoeken">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Zoeken">
-<!ENTITY aboutTor.searchSP.privacy.label "veilig">
-<!ENTITY aboutTor.searchDDG.privacy.label "veilig">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/ned/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "met">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "met">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "Startpage">
-<!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 "Bijkomende informatie:">
 <!ENTITY aboutTor.torInfo2.label "Land & IP Adres:">
diff --git a/nn/aboutTor.dtd b/nn/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/nn/aboutTor.dtd
+++ b/nn/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/nso/aboutTor.dtd b/nso/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/nso/aboutTor.dtd
+++ b/nso/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/oc/aboutTor.dtd b/oc/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/oc/aboutTor.dtd
+++ b/oc/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/or/aboutTor.dtd b/or/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/or/aboutTor.dtd
+++ b/or/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/pa/aboutTor.dtd b/pa/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/pa/aboutTor.dtd
+++ b/pa/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/pap/aboutTor.dtd b/pap/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/pap/aboutTor.dtd
+++ b/pap/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/pl/aboutTor.dtd b/pl/aboutTor.dtd
index 2ac4a75..a4813da 100644
--- a/pl/aboutTor.dtd
+++ b/pl/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Szukaj">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Szukaj">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Szukaj">
-<!ENTITY aboutTor.searchSP.privacy.label "bezpiecznie">
-<!ENTITY aboutTor.searchDDG.privacy.label "bezpiecznie">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "z">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "z">
-<!ENTITY aboutTor.searchSP.search.label "Strona startowa">
-<!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 "Dodatkowe informacje:">
 <!ENTITY aboutTor.torInfo2.label "Kraj i adres IP:">
diff --git a/pms/aboutTor.dtd b/pms/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/pms/aboutTor.dtd
+++ b/pms/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ps/aboutTor.dtd b/ps/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/ps/aboutTor.dtd
+++ b/ps/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/pt/aboutTor.dtd b/pt/aboutTor.dtd
index 4cbd760..05e9d84 100644
--- a/pt/aboutTor.dtd
+++ b/pt/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Procurar">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Procurar">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Procurar">
-<!ENTITY aboutTor.searchSP.privacy.label "de forma segura">
-<!ENTITY aboutTor.searchDDG.privacy.label "de forma segura">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "com">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "com">
-<!ENTITY aboutTor.searchSP.search.label "Página inicial">
-<!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 "Informação adicional:">
 <!ENTITY aboutTor.torInfo2.label "País e endereço IP:">
diff --git a/pt_BR/aboutTor.dtd b/pt_BR/aboutTor.dtd
index ef037a9..05b7685 100644
--- a/pt_BR/aboutTor.dtd
+++ b/pt_BR/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Procurar">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Procurar">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Procurar">
-<!ENTITY aboutTor.searchSP.privacy.label "De maneira protegida">
-<!ENTITY aboutTor.searchDDG.privacy.label "de maneira protegida">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/por/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "com">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "com">
-<!ENTITY aboutTor.searchSP.search.label "Página de Início">
-<!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 "Para outras informações:">
 <!ENTITY aboutTor.torInfo2.label "País e Endereço IP:">
diff --git a/ro/aboutTor.dtd b/ro/aboutTor.dtd
index 686d481..89b9832 100644
--- a/ro/aboutTor.dtd
+++ b/ro/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Căutare">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Cautare">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Cautare">
-<!ENTITY aboutTor.searchSP.privacy.label "in siguranta">
-<!ENTITY aboutTor.searchDDG.privacy.label "in siguranta">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "cu">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "cu">
-<!ENTITY aboutTor.searchSP.search.label "Pagină de start">
-<!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 "Informații adiționale:">
 <!ENTITY aboutTor.torInfo2.label "Țara și adresa IP:">
diff --git a/ru/aboutTor.dtd b/ru/aboutTor.dtd
index 0d53ea3..efe3ff1 100644
--- a/ru/aboutTor.dtd
+++ b/ru/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Поиск">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!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 "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "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 "Страна & IP-адрес">
diff --git a/ru at petr1708/aboutTor.dtd b/ru at petr1708/aboutTor.dtd
index b88b257..cce8d10 100644
--- a/ru at petr1708/aboutTor.dtd
+++ b/ru at petr1708/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Поиск">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!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 "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "с">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "с">
-<!ENTITY aboutTor.searchSP.search.label "Начальная страница">
-<!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 "Страна и IP адрес:">
diff --git a/sco/aboutTor.dtd b/sco/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/sco/aboutTor.dtd
+++ b/sco/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/si/aboutTor.dtd b/si/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/si/aboutTor.dtd
+++ b/si/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/si_LK/aboutTor.dtd b/si_LK/aboutTor.dtd
index 06907cc..5279dc1 100644
--- a/si_LK/aboutTor.dtd
+++ b/si_LK/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "සොයන්න">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!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 "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "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 "රට හා IP ලිපිනය:">
diff --git a/sk/aboutTor.dtd b/sk/aboutTor.dtd
index d25c48e..a1d880d 100644
--- a/sk/aboutTor.dtd
+++ b/sk/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Hľadať">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Hľadať">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Hľadať">
-<!ENTITY aboutTor.searchSP.privacy.label "bezpečne">
-<!ENTITY aboutTor.searchDDG.privacy.label "bezpečne">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "s">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "s">
-<!ENTITY aboutTor.searchSP.search.label "Úvodná stránka">
-<!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 "Doplňujúce Informácie:">
 <!ENTITY aboutTor.torInfo2.label "Krajina & IP Adresa: ">
diff --git a/sk_SK/aboutTor.dtd b/sk_SK/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/sk_SK/aboutTor.dtd
+++ b/sk_SK/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/sl/aboutTor.dtd b/sl/aboutTor.dtd
index 7593e71..f6615f5 100644
--- a/sl/aboutTor.dtd
+++ b/sl/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Išči">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/sl_SI/aboutTor.dtd b/sl_SI/aboutTor.dtd
index c32a485..d968abd 100644
--- a/sl_SI/aboutTor.dtd
+++ b/sl_SI/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -24,33 +24,8 @@
 
 <!ENTITY aboutTor.search.label "Išči">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Išči">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Išči">
-<!ENTITY aboutTor.searchSP.privacy.label "varno">
-<!ENTITY aboutTor.searchDDG.privacy.label "varno">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
-<!ENTITY aboutTor.searchSP.search.label "Začetna stran">
-<!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 "Dodatne informacije:">
 <!ENTITY aboutTor.torInfo2.label "Država & IP naslov:">
diff --git a/sn/aboutTor.dtd b/sn/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/sn/aboutTor.dtd
+++ b/sn/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/so/aboutTor.dtd b/so/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/so/aboutTor.dtd
+++ b/so/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/son/aboutTor.dtd b/son/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/son/aboutTor.dtd
+++ b/son/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/sq/aboutTor.dtd b/sq/aboutTor.dtd
index f7b6a68..6cb3c5e 100644
--- a/sq/aboutTor.dtd
+++ b/sq/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Kërko">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/sq_AL/aboutTor.dtd b/sq_AL/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/sq_AL/aboutTor.dtd
+++ b/sq_AL/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/sr/aboutTor.dtd b/sr/aboutTor.dtd
index bdd9597..b573827 100644
--- a/sr/aboutTor.dtd
+++ b/sr/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Тражи:">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!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 "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "са">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "са">
-<!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 "Држава и ИП адреса:">
diff --git a/sr at latin/aboutTor.dtd b/sr at latin/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/sr at latin/aboutTor.dtd
+++ b/sr at latin/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/st/aboutTor.dtd b/st/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/st/aboutTor.dtd
+++ b/st/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/su/aboutTor.dtd b/su/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/su/aboutTor.dtd
+++ b/su/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/sv/aboutTor.dtd b/sv/aboutTor.dtd
index a1efbdf..d3b5e1f 100644
--- a/sv/aboutTor.dtd
+++ b/sv/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Sök">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Sök ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Sök ">
-<!ENTITY aboutTor.searchSP.privacy.label "säkert">
-<!ENTITY aboutTor.searchDDG.privacy.label "säkert">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "med ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "med ">
-<!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 "Ytterligare information:">
 <!ENTITY aboutTor.torInfo2.label "Land och IP-adress:">
diff --git a/sw/aboutTor.dtd b/sw/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/sw/aboutTor.dtd
+++ b/sw/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/szl/aboutTor.dtd b/szl/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/szl/aboutTor.dtd
+++ b/szl/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ta/aboutTor.dtd b/ta/aboutTor.dtd
index 949f564..4d5239a 100644
--- a/ta/aboutTor.dtd
+++ b/ta/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "தேடு">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!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 "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "உடன்">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "உடன்">
-<!ENTITY aboutTor.searchSP.search.label "தொடக்க பக்கம்">
-<!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 "நாடு மற்றும் IP முகவரி:">
diff --git a/te/aboutTor.dtd b/te/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/te/aboutTor.dtd
+++ b/te/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/te_IN/aboutTor.dtd b/te_IN/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/te_IN/aboutTor.dtd
+++ b/te_IN/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/tg/aboutTor.dtd b/tg/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/tg/aboutTor.dtd
+++ b/tg/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/th/aboutTor.dtd b/th/aboutTor.dtd
index fdddae5..294df02 100644
--- a/th/aboutTor.dtd
+++ b/th/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "ค้นหา">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!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 "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "กับ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "กับ">
-<!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 "ประเทศและที่อยู่ IP:">
diff --git a/ti/aboutTor.dtd b/ti/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/ti/aboutTor.dtd
+++ b/ti/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/tk/aboutTor.dtd b/tk/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/tk/aboutTor.dtd
+++ b/tk/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd
index c8a69e0..e01e82b 100644
--- a/tr/aboutTor.dtd
+++ b/tr/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Ara">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Ara">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Ara">
-<!ENTITY aboutTor.searchSP.privacy.label "güvenli bir şekilde">
-<!ENTITY aboutTor.searchDDG.privacy.label "güvenli bir şekilde">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/tur/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "birlikte">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "birlikte">
-<!ENTITY aboutTor.searchSP.search.label "Başlangıç Sayfası">
-<!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 "Ek bilgi:">
 <!ENTITY aboutTor.torInfo2.label "Ãœlke ve IP Adresi:">
diff --git a/uk/aboutTor.dtd b/uk/aboutTor.dtd
index c4ef3da..72e5721 100644
--- a/uk/aboutTor.dtd
+++ b/uk/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Пошук">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!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 "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "з">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "з">
-<!ENTITY aboutTor.searchSP.search.label "Початкова сторінка">
-<!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 "Країна і IP-адреса:">
diff --git a/ur/aboutTor.dtd b/ur/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/ur/aboutTor.dtd
+++ b/ur/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ur_PK/aboutTor.dtd b/ur_PK/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/ur_PK/aboutTor.dtd
+++ b/ur_PK/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/uz/aboutTor.dtd b/uz/aboutTor.dtd
index d6876ab..7128bb8 100644
--- a/uz/aboutTor.dtd
+++ b/uz/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/ve/aboutTor.dtd b/ve/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/ve/aboutTor.dtd
+++ b/ve/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/vi/aboutTor.dtd b/vi/aboutTor.dtd
index 3b1426c..afb7da7 100644
--- a/vi/aboutTor.dtd
+++ b/vi/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "Tìm kiếm">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Tìm kiếm">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Tìm kiếm">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "vá»›i">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "vá»›i">
-<!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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Quốc gia & Địa chỉ IP:">
diff --git a/wa/aboutTor.dtd b/wa/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/wa/aboutTor.dtd
+++ b/wa/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/wo/aboutTor.dtd b/wo/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/wo/aboutTor.dtd
+++ b/wo/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/zh_CN/aboutTor.dtd b/zh_CN/aboutTor.dtd
index b9d8bc0..8e84ded 100644
--- a/zh_CN/aboutTor.dtd
+++ b/zh_CN/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "安全的搜索引擎">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!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 "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 "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 "国家与 IP 地址:">
diff --git a/zh_HK/aboutTor.dtd b/zh_HK/aboutTor.dtd
index 2e1b3c7..68e9c38 100644
--- a/zh_HK/aboutTor.dtd
+++ b/zh_HK/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "尋找">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "尋找">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "尋找">
-<!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "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 "Country & IP Address:">
diff --git a/zh_TW/aboutTor.dtd b/zh_TW/aboutTor.dtd
index 0886228..1ff3298 100644
--- a/zh_TW/aboutTor.dtd
+++ b/zh_TW/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!ENTITY aboutTor.search.label "搜尋">
 
-<!-- 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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!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 "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "與">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "與">
-<!ENTITY aboutTor.searchSP.search.label "起始頁">
-<!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 "國家和 IP:">
diff --git a/zu/aboutTor.dtd b/zu/aboutTor.dtd
index c1483a8..7128bb8 100644
--- a/zu/aboutTor.dtd
+++ b/zu/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2013, The Tor Project, Inc.
+   - Copyright (c) 2014, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -23,33 +23,8 @@
 
 <!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
-   - same time).   In English, the sentence reads:
-   -    Search securely with Startpage.
-   - or:
-   -    Search securely with DuckDuckGo.
-   - The sentence contains two embedded links for "securely" and
-   - the search engine ("Startpage" or "DuckDuckGo").
-  -->
 <!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 "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&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 "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">




More information about the tor-commits mailing list