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

[tor-commits] [torbutton/master] Bug #10398: Do not create untranslatable strings.

To: tor-commits@xxxxxxxxxxxxxxxxxxxx, tbb-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [torbutton/master] Bug #10398: Do not create untranslatable strings.
From: mikeperry@xxxxxxxxxxxxxx
Date: Sun, 30 Mar 2014 04:18:35 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sun, 30 Mar 2014 00:19:09 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Kathy Brade <brade@xxxxxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 54c8721acf3c52855405c669ebfbdbeead69806a
Author: Kathy Brade <brade@xxxxxxxxxxxxxxxxx>
Date:   Thu Jan 23 15:54:38 2014 -0500

    Bug #10398: Do not create untranslatable strings.
    
    Our use of entities that contained trailing spaces was a bad idea:  they
    got lost during the translation process.  Instead, we now use a template
    that contains a snippet of HTML, with the search engine URLs as separate
    property strings.
    
    We did our best to preserve the existing translated strings, converting
    them to the new scheme and adding the missing spaces.
---
 src/chrome/content/aboutTor/aboutTor.xhtml  |   26 ++++++++++++++++++++++++--
 src/chrome/locale/af/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/af/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ak/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/ak/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/am/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/am/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ar/aboutTor.dtd           |   27 +--------------------------
 src/chrome/locale/ar/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/arn/aboutTor.dtd          |   19 +------------------
 src/chrome/locale/arn/aboutTor.properties   |   15 +++++++++++++++
 src/chrome/locale/ast/aboutTor.dtd          |   19 +------------------
 src/chrome/locale/ast/aboutTor.properties   |   15 +++++++++++++++
 src/chrome/locale/az/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/az/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/be/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/be/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/bg/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/bg/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/bms/aboutTor.dtd          |   19 +------------------
 src/chrome/locale/bms/aboutTor.properties   |   15 +++++++++++++++
 src/chrome/locale/bn-IN/aboutTor.dtd        |   19 +------------------
 src/chrome/locale/bn-IN/aboutTor.properties |   15 +++++++++++++++
 src/chrome/locale/bn/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/bn/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/bo/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/bo/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/br/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/br/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/bs/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/bs/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ca/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/ca/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/cs/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/cs/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/csb/aboutTor.dtd          |   19 +------------------
 src/chrome/locale/csb/aboutTor.properties   |   15 +++++++++++++++
 src/chrome/locale/cy/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/cy/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/da/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/da/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/de/aboutTor.dtd           |   27 +--------------------------
 src/chrome/locale/de/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/dz/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/dz/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/el/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/el/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/en/aboutTor.dtd           |   27 +--------------------------
 src/chrome/locale/en/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/eo/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/eo/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/es/aboutTor.dtd           |   27 +--------------------------
 src/chrome/locale/es/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/et/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/et/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/eu/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/eu/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/fa/aboutTor.dtd           |   27 +--------------------------
 src/chrome/locale/fa/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/fi/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/fi/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/fil/aboutTor.dtd          |   19 +------------------
 src/chrome/locale/fil/aboutTor.properties   |   15 +++++++++++++++
 src/chrome/locale/fo/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/fo/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/fr/aboutTor.dtd           |   27 +--------------------------
 src/chrome/locale/fr/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/fur/aboutTor.dtd          |   19 +------------------
 src/chrome/locale/fur/aboutTor.properties   |   15 +++++++++++++++
 src/chrome/locale/fy/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/fy/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ga/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/ga/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/gl/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/gl/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/gu/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/gu/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/gun/aboutTor.dtd          |   19 +------------------
 src/chrome/locale/gun/aboutTor.properties   |   15 +++++++++++++++
 src/chrome/locale/ha/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/ha/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/he/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/he/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/hi/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/hi/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/hr/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/hr/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ht/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/ht/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/hu/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/hu/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/hy/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/hy/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/id/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/id/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/is/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/is/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/it/aboutTor.dtd           |   27 +--------------------------
 src/chrome/locale/it/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ja/aboutTor.dtd           |   27 +--------------------------
 src/chrome/locale/ja/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/jv/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/jv/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ka/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/ka/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/km/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/km/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/kn/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/kn/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ko/aboutTor.dtd           |   27 +--------------------------
 src/chrome/locale/ko/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ku/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/ku/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/kw/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/kw/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ky/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/ky/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/lb/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/lb/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/lg/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/lg/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ln/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/ln/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/lo/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/lo/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/lt/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/lt/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/lv/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/lv/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/mg/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/mg/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/mi/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/mi/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/mk/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/mk/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ml/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/ml/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/mn/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/mn/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/mr/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/mr/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ms/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/ms/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/mt/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/mt/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/my/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/my/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/nah/aboutTor.dtd          |   19 +------------------
 src/chrome/locale/nah/aboutTor.properties   |   15 +++++++++++++++
 src/chrome/locale/nap/aboutTor.dtd          |   19 +------------------
 src/chrome/locale/nap/aboutTor.properties   |   15 +++++++++++++++
 src/chrome/locale/nb/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/nb/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ne/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/ne/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/nl/aboutTor.dtd           |   27 +--------------------------
 src/chrome/locale/nl/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/nn/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/nn/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/nso/aboutTor.dtd          |   19 +------------------
 src/chrome/locale/nso/aboutTor.properties   |   15 +++++++++++++++
 src/chrome/locale/oc/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/oc/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/or/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/or/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/pa/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/pa/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/pap/aboutTor.dtd          |   19 +------------------
 src/chrome/locale/pap/aboutTor.properties   |   15 +++++++++++++++
 src/chrome/locale/pl/aboutTor.dtd           |   27 +--------------------------
 src/chrome/locale/pl/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/pms/aboutTor.dtd          |   19 +------------------
 src/chrome/locale/pms/aboutTor.properties   |   15 +++++++++++++++
 src/chrome/locale/ps/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/ps/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/pt-BR/aboutTor.dtd        |   19 +------------------
 src/chrome/locale/pt-BR/aboutTor.properties |   15 +++++++++++++++
 src/chrome/locale/pt/aboutTor.dtd           |   27 +--------------------------
 src/chrome/locale/pt/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ro/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/ro/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ru/aboutTor.dtd           |   27 +--------------------------
 src/chrome/locale/ru/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/sco/aboutTor.dtd          |   19 +------------------
 src/chrome/locale/sco/aboutTor.properties   |   15 +++++++++++++++
 src/chrome/locale/sk/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/sk/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/sl/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/sl/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/so/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/so/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/son/aboutTor.dtd          |   19 +------------------
 src/chrome/locale/son/aboutTor.properties   |   15 +++++++++++++++
 src/chrome/locale/sq/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/sq/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/sr/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/sr/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/st/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/st/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/su/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/su/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/sv/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/sv/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/sw/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/sw/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ta/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/ta/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/te/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/te/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/tg/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/tg/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/th/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/th/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ti/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/ti/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/tk/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/tk/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/tr/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/tr/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/uk/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/uk/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ur/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/ur/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/ve/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/ve/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/vi/aboutTor.dtd           |   27 +--------------------------
 src/chrome/locale/vi/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/wa/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/wa/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/wo/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/wo/aboutTor.properties    |   15 +++++++++++++++
 src/chrome/locale/zh-CN/aboutTor.dtd        |   27 +--------------------------
 src/chrome/locale/zh-CN/aboutTor.properties |   15 +++++++++++++++
 src/chrome/locale/zh-HK/aboutTor.dtd        |   19 +------------------
 src/chrome/locale/zh-HK/aboutTor.properties |   15 +++++++++++++++
 src/chrome/locale/zh-TW/aboutTor.dtd        |   19 +------------------
 src/chrome/locale/zh-TW/aboutTor.properties |   15 +++++++++++++++
 src/chrome/locale/zu/aboutTor.dtd           |   19 +------------------
 src/chrome/locale/zu/aboutTor.properties    |   15 +++++++++++++++
 239 files changed, 1928 insertions(+), 2264 deletions(-)

diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml
index ce06941..02e0c7c 100644
--- a/src/chrome/content/aboutTor/aboutTor.xhtml
+++ b/src/chrome/content/aboutTor/aboutTor.xhtml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   - 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:
   -->
@@ -25,6 +25,8 @@
  <![CDATA[
 function onLoad()
 {
+  insertPropertyStrings();
+
   window.addEventListener("resize", function() {
     resizeToolbarIconArrow();
   }, false);
@@ -45,6 +47,26 @@ function resizeToolbarIconArrow()
     rightDiv.style.width = width + "px";
   }
 }
+
+function insertPropertyStrings()
+{
+  try {
+    var kPropertiesURL = "chrome://torbutton/locale/aboutTor.properties";
+
+    Components.utils.import("resource://gre/modules/Services.jsm");
+    var gStringBundle = Services.strings.createBundle(kPropertiesURL);
+    var s1 = gStringBundle.GetStringFromName("aboutTor.searchSP.privacy.link");
+    var s2 = gStringBundle.GetStringFromName("aboutTor.searchSP.search.link");
+    var result = gStringBundle.formatStringFromName("aboutTor.searchSP.privacy",
+                  [s1, s2], 2);
+    if (result) {
+      var elem = document.getElementById("searchProviderInfo");
+      if (elem)
+        elem.innerHTML = result;
+    }
+  } catch(e) {};
+}
+
 ]]>
 </script>
 </head>
@@ -84,7 +106,7 @@ function resizeToolbarIconArrow()
     </div>
     <input name="q" autocomplete="off" id="sx" type="text"/>
   </div>
-  <h4>&aboutTor.searchSP.privacy.beforeLink.label;<a href="&aboutTor.searchSP.privacy.link;">&aboutTor.searchSP.privacy.label;</a>&aboutTor.searchSP.privacy.afterLink.label;&aboutTor.searchSP.search.beforeLink.label;<a href="&aboutTor.searchSP.search.link;">&aboutTor.searchSP.search.label;</a>&aboutTor.searchSP.search.afterLink.label;</h4>
+  <h4 id="searchProviderInfo" />
   </form>
 </div>
 
diff --git a/src/chrome/locale/af/aboutTor.dtd b/src/chrome/locale/af/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/af/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/af/aboutTor.properties b/src/chrome/locale/af/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/af/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ak/aboutTor.dtd b/src/chrome/locale/ak/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ak/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/ak/aboutTor.properties b/src/chrome/locale/ak/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ak/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/am/aboutTor.dtd b/src/chrome/locale/am/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/am/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/am/aboutTor.properties b/src/chrome/locale/am/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/am/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd
index 8b0d7cf..e02388f 100644
--- a/src/chrome/locale/ar/aboutTor.dtd
+++ b/src/chrome/locale/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 "&amp;nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;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/src/chrome/locale/ar/aboutTor.properties b/src/chrome/locale/ar/aboutTor.properties
new file mode 100644
index 0000000..09f1f91
--- /dev/null
+++ b/src/chrome/locale/ar/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Ø¨ØØ« <a href="%1$S">Ø¨Ø¢Ù?Ø§Ù?</a> Ù?Ø¹ <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Ø¨ØØ« <a href="%1$S">Ø¨Ø¢Ù?Ø§Ù?</a> Ù?Ø¹ <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/arn/aboutTor.dtd b/src/chrome/locale/arn/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/arn/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/arn/aboutTor.properties b/src/chrome/locale/arn/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/arn/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ast/aboutTor.dtd b/src/chrome/locale/ast/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ast/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/ast/aboutTor.properties b/src/chrome/locale/ast/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ast/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/az/aboutTor.dtd b/src/chrome/locale/az/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/az/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/az/aboutTor.properties b/src/chrome/locale/az/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/az/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/be/aboutTor.dtd b/src/chrome/locale/be/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/be/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/be/aboutTor.properties b/src/chrome/locale/be/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/be/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/bg/aboutTor.dtd b/src/chrome/locale/bg/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/bg/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/bg/aboutTor.properties b/src/chrome/locale/bg/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/bg/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/bms/aboutTor.dtd b/src/chrome/locale/bms/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/bms/aboutTor.dtd
+++ b/src/chrome/locale/bms/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,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/bms/aboutTor.properties b/src/chrome/locale/bms/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/bms/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/bn-IN/aboutTor.dtd b/src/chrome/locale/bn-IN/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/bn-IN/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/bn-IN/aboutTor.properties b/src/chrome/locale/bn-IN/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/bn-IN/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/bn/aboutTor.dtd b/src/chrome/locale/bn/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/bn/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/bn/aboutTor.properties b/src/chrome/locale/bn/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/bn/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/bo/aboutTor.dtd b/src/chrome/locale/bo/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/bo/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/bo/aboutTor.properties b/src/chrome/locale/bo/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/bo/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/br/aboutTor.dtd b/src/chrome/locale/br/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/br/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/br/aboutTor.properties b/src/chrome/locale/br/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/br/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/bs/aboutTor.dtd b/src/chrome/locale/bs/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/bs/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/bs/aboutTor.properties b/src/chrome/locale/bs/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/bs/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ca/aboutTor.dtd b/src/chrome/locale/ca/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ca/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/ca/aboutTor.properties b/src/chrome/locale/ca/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ca/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/cs/aboutTor.dtd b/src/chrome/locale/cs/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/cs/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/cs/aboutTor.properties b/src/chrome/locale/cs/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/cs/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/csb/aboutTor.dtd b/src/chrome/locale/csb/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/csb/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/csb/aboutTor.properties b/src/chrome/locale/csb/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/csb/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/cy/aboutTor.dtd b/src/chrome/locale/cy/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/cy/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/cy/aboutTor.properties b/src/chrome/locale/cy/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/cy/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/da/aboutTor.dtd b/src/chrome/locale/da/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/da/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/da/aboutTor.properties b/src/chrome/locale/da/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/da/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd
index de478a2..7948f5f 100644
--- a/src/chrome/locale/de/aboutTor.dtd
+++ b/src/chrome/locale/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 "Suchen">
 
-<!-- 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 "&amp;nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;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 &amp; IP-Adresse:">
diff --git a/src/chrome/locale/de/aboutTor.properties b/src/chrome/locale/de/aboutTor.properties
new file mode 100644
index 0000000..55f555d
--- /dev/null
+++ b/src/chrome/locale/de/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Suche <a href="%1$S">sicher</a> mit <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/deu/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Suche <a href="%1$S">sicher</a> mit <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/dz/aboutTor.dtd b/src/chrome/locale/dz/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/dz/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/dz/aboutTor.properties b/src/chrome/locale/dz/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/dz/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/el/aboutTor.dtd b/src/chrome/locale/el/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/el/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/el/aboutTor.properties b/src/chrome/locale/el/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/el/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd
index 89a01a2..7128bb8 100644
--- a/src/chrome/locale/en/aboutTor.dtd
+++ b/src/chrome/locale/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 &amp; IP Address:">
diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/en/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/eo/aboutTor.dtd b/src/chrome/locale/eo/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/eo/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/eo/aboutTor.properties b/src/chrome/locale/eo/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/eo/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd
index 57f24f7..af9ff47 100644
--- a/src/chrome/locale/es/aboutTor.dtd
+++ b/src/chrome/locale/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 "&amp;nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;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/src/chrome/locale/es/aboutTor.properties b/src/chrome/locale/es/aboutTor.properties
new file mode 100644
index 0000000..f8bdb1d
--- /dev/null
+++ b/src/chrome/locale/es/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Busque <a href="%1$S">con seguridad</a> con <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/esp/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/esp
+
+aboutTor.searchDDG.privacy=Busque <a href="%1$S">con seguridad</a> con <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/et/aboutTor.dtd b/src/chrome/locale/et/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/et/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/et/aboutTor.properties b/src/chrome/locale/et/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/et/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/eu/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/eu/aboutTor.properties b/src/chrome/locale/eu/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/eu/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd
index 08bf75c..fa8e9ae 100644
--- a/src/chrome/locale/fa/aboutTor.dtd
+++ b/src/chrome/locale/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 "&amp;nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/";>
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/";>
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
 <!ENTITY aboutTor.torInfo1.label "Ø§Ø·Ù?Ø§Ø¹Ø§Øª Ø¨Ù?Ø´ØªØ±">
 <!ENTITY aboutTor.torInfo2.label "Ù?Ø´Ù?Ø± Ù? Ø¢Ø¯Ø±Ø³ Ø¢Ù? Ù¾Û?:">
diff --git a/src/chrome/locale/fa/aboutTor.properties b/src/chrome/locale/fa/aboutTor.properties
new file mode 100644
index 0000000..3c1c06c
--- /dev/null
+++ b/src/chrome/locale/fa/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Ø¬Ø³ØªØ¬Ù? <a href="%1$S">Ø¨ØµÙ?Ø±Øª Ø§Ù?Ù?</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Ø¬Ø³ØªØ¬Ù? <a href="%1$S">Ø¨ØµÙ?Ø±Øª Ø§Ù?Ù?</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/fi/aboutTor.dtd b/src/chrome/locale/fi/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/fi/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/fi/aboutTor.properties b/src/chrome/locale/fi/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/fi/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/fil/aboutTor.dtd b/src/chrome/locale/fil/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/fil/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/fil/aboutTor.properties b/src/chrome/locale/fil/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/fil/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/fo/aboutTor.dtd b/src/chrome/locale/fo/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/fo/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/fo/aboutTor.properties b/src/chrome/locale/fo/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/fo/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd
index a0b041b..41ad3e5 100644
--- a/src/chrome/locale/fr/aboutTor.dtd
+++ b/src/chrome/locale/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 "&amp;nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;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 &amp; adresse IPÂ :">
diff --git a/src/chrome/locale/fr/aboutTor.properties b/src/chrome/locale/fr/aboutTor.properties
new file mode 100644
index 0000000..5bd5049
--- /dev/null
+++ b/src/chrome/locale/fr/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Rechercher <a href="%1$S">en toute sÃ©curitÃ©</a> avec <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Rechercher <a href="%1$S">en toute sÃ©curitÃ©</a> avec <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/fur/aboutTor.dtd b/src/chrome/locale/fur/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/fur/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/fur/aboutTor.properties b/src/chrome/locale/fur/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/fur/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/fy/aboutTor.dtd b/src/chrome/locale/fy/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/fy/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/fy/aboutTor.properties b/src/chrome/locale/fy/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/fy/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ga/aboutTor.dtd b/src/chrome/locale/ga/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ga/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/ga/aboutTor.properties b/src/chrome/locale/ga/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ga/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/gl/aboutTor.dtd b/src/chrome/locale/gl/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/gl/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/gl/aboutTor.properties b/src/chrome/locale/gl/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/gl/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/gu/aboutTor.dtd b/src/chrome/locale/gu/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/gu/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/gu/aboutTor.properties b/src/chrome/locale/gu/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/gu/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/gun/aboutTor.dtd b/src/chrome/locale/gun/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/gun/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/gun/aboutTor.properties b/src/chrome/locale/gun/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/gun/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ha/aboutTor.dtd b/src/chrome/locale/ha/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ha/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/ha/aboutTor.properties b/src/chrome/locale/ha/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ha/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/he/aboutTor.dtd b/src/chrome/locale/he/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/he/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/he/aboutTor.properties b/src/chrome/locale/he/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/he/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/hi/aboutTor.dtd b/src/chrome/locale/hi/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/hi/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/hi/aboutTor.properties b/src/chrome/locale/hi/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/hi/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/hr/aboutTor.dtd b/src/chrome/locale/hr/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/hr/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/hr/aboutTor.properties b/src/chrome/locale/hr/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/hr/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ht/aboutTor.dtd b/src/chrome/locale/ht/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ht/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/ht/aboutTor.properties b/src/chrome/locale/ht/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ht/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/hu/aboutTor.dtd b/src/chrome/locale/hu/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/hu/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/hu/aboutTor.properties b/src/chrome/locale/hu/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/hu/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/hy/aboutTor.dtd b/src/chrome/locale/hy/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/hy/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/hy/aboutTor.properties b/src/chrome/locale/hy/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/hy/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/id/aboutTor.dtd b/src/chrome/locale/id/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/id/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/id/aboutTor.properties b/src/chrome/locale/id/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/id/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/is/aboutTor.dtd b/src/chrome/locale/is/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/is/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/is/aboutTor.properties b/src/chrome/locale/is/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/is/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd
index 57b1a42..151a7d5 100644
--- a/src/chrome/locale/it/aboutTor.dtd
+++ b/src/chrome/locale/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 "&amp;nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;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 &amp; Indirizzo IP:">
diff --git a/src/chrome/locale/it/aboutTor.properties b/src/chrome/locale/it/aboutTor.properties
new file mode 100644
index 0000000..0748189
--- /dev/null
+++ b/src/chrome/locale/it/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Cerca <a href="%1$S">in modo sicuro</a> con <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/ita/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Cerca <a href="%1$S">in modo sicuro</a> con <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd
index 1f96caf..4d27e73 100644
--- a/src/chrome/locale/ja/aboutTor.dtd
+++ b/src/chrome/locale/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 "&amp;nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;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/src/chrome/locale/ja/aboutTor.properties b/src/chrome/locale/ja/aboutTor.properties
new file mode 100644
index 0000000..591c9ca
--- /dev/null
+++ b/src/chrome/locale/ja/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=æ¤?ç´¢ <a href="%1$S">å®?å?¨ã?«</a> ä¸?ç·?ã?« <a href="%2$S">ã?¹ã?¿ã?¼ã??ã??ã?¼ã?¸</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=æ¤?ç´¢ <a href="%1$S">å®?å?¨ã?«</a> ä¸?ç·?ã?« <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/jv/aboutTor.dtd b/src/chrome/locale/jv/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/jv/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/jv/aboutTor.properties b/src/chrome/locale/jv/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/jv/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ka/aboutTor.dtd b/src/chrome/locale/ka/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ka/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/ka/aboutTor.properties b/src/chrome/locale/ka/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ka/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/km/aboutTor.dtd b/src/chrome/locale/km/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/km/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/km/aboutTor.properties b/src/chrome/locale/km/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/km/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/kn/aboutTor.dtd b/src/chrome/locale/kn/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/kn/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/kn/aboutTor.properties b/src/chrome/locale/kn/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/kn/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd
index 008a804..d388ca4 100644
--- a/src/chrome/locale/ko/aboutTor.dtd
+++ b/src/chrome/locale/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 "">
 <!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label " ">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label " ">
 
 <!ENTITY aboutTor.torInfo1.label "">
 <!ENTITY aboutTor.torInfo2.label "">
diff --git a/src/chrome/locale/ko/aboutTor.properties b/src/chrome/locale/ko/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ko/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ku/aboutTor.dtd b/src/chrome/locale/ku/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ku/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/ku/aboutTor.properties b/src/chrome/locale/ku/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ku/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/kw/aboutTor.dtd b/src/chrome/locale/kw/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/kw/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/kw/aboutTor.properties b/src/chrome/locale/kw/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/kw/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ky/aboutTor.dtd b/src/chrome/locale/ky/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ky/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/ky/aboutTor.properties b/src/chrome/locale/ky/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ky/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/lb/aboutTor.dtd b/src/chrome/locale/lb/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/lb/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/lb/aboutTor.properties b/src/chrome/locale/lb/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/lb/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/lg/aboutTor.dtd b/src/chrome/locale/lg/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/lg/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/lg/aboutTor.properties b/src/chrome/locale/lg/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/lg/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ln/aboutTor.dtd b/src/chrome/locale/ln/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ln/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/ln/aboutTor.properties b/src/chrome/locale/ln/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ln/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/lo/aboutTor.dtd b/src/chrome/locale/lo/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/lo/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/lo/aboutTor.properties b/src/chrome/locale/lo/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/lo/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/lt/aboutTor.dtd b/src/chrome/locale/lt/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/lt/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/lt/aboutTor.properties b/src/chrome/locale/lt/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/lt/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/lv/aboutTor.dtd b/src/chrome/locale/lv/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/lv/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/lv/aboutTor.properties b/src/chrome/locale/lv/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/lv/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/mg/aboutTor.dtd b/src/chrome/locale/mg/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/mg/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/mg/aboutTor.properties b/src/chrome/locale/mg/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/mg/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/mi/aboutTor.dtd b/src/chrome/locale/mi/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/mi/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/mi/aboutTor.properties b/src/chrome/locale/mi/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/mi/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/mk/aboutTor.dtd b/src/chrome/locale/mk/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/mk/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/mk/aboutTor.properties b/src/chrome/locale/mk/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/mk/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ml/aboutTor.dtd b/src/chrome/locale/ml/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ml/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/ml/aboutTor.properties b/src/chrome/locale/ml/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ml/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/mn/aboutTor.dtd b/src/chrome/locale/mn/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/mn/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/mn/aboutTor.properties b/src/chrome/locale/mn/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/mn/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/mr/aboutTor.dtd b/src/chrome/locale/mr/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/mr/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/mr/aboutTor.properties b/src/chrome/locale/mr/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/mr/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ms/aboutTor.dtd b/src/chrome/locale/ms/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ms/aboutTor.dtd
+++ b/src/chrome/locale/ms/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,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/ms/aboutTor.properties b/src/chrome/locale/ms/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ms/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/mt/aboutTor.dtd b/src/chrome/locale/mt/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/mt/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/mt/aboutTor.properties b/src/chrome/locale/mt/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/mt/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/my/aboutTor.dtd b/src/chrome/locale/my/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/my/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/my/aboutTor.properties b/src/chrome/locale/my/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/my/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/nah/aboutTor.dtd b/src/chrome/locale/nah/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/nah/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/nah/aboutTor.properties b/src/chrome/locale/nah/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/nah/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/nap/aboutTor.dtd b/src/chrome/locale/nap/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/nap/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/nap/aboutTor.properties b/src/chrome/locale/nap/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/nap/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/nb/aboutTor.dtd b/src/chrome/locale/nb/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/nb/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/nb/aboutTor.properties b/src/chrome/locale/nb/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/nb/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ne/aboutTor.dtd b/src/chrome/locale/ne/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ne/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/ne/aboutTor.properties b/src/chrome/locale/ne/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ne/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd
index fd73f07..980ac35 100644
--- a/src/chrome/locale/nl/aboutTor.dtd
+++ b/src/chrome/locale/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 "&amp;nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;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 &amp; IP Adres:">
diff --git a/src/chrome/locale/nl/aboutTor.properties b/src/chrome/locale/nl/aboutTor.properties
new file mode 100644
index 0000000..e6d6650
--- /dev/null
+++ b/src/chrome/locale/nl/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Zoeken <a href="%1$S">veilig</a> met <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/ned/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Zoeken <a href="%1$S">veilig</a> met <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/nn/aboutTor.dtd b/src/chrome/locale/nn/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/nn/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/nn/aboutTor.properties b/src/chrome/locale/nn/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/nn/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/nso/aboutTor.dtd b/src/chrome/locale/nso/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/nso/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/nso/aboutTor.properties b/src/chrome/locale/nso/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/nso/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/oc/aboutTor.dtd b/src/chrome/locale/oc/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/oc/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/oc/aboutTor.properties b/src/chrome/locale/oc/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/oc/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/or/aboutTor.dtd b/src/chrome/locale/or/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/or/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/or/aboutTor.properties b/src/chrome/locale/or/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/or/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/pa/aboutTor.dtd b/src/chrome/locale/pa/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/pa/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/pa/aboutTor.properties b/src/chrome/locale/pa/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/pa/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/pap/aboutTor.dtd b/src/chrome/locale/pap/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/pap/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/pap/aboutTor.properties b/src/chrome/locale/pap/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/pap/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd
index 2ac4a75..a4813da 100644
--- a/src/chrome/locale/pl/aboutTor.dtd
+++ b/src/chrome/locale/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 "&amp;nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;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/src/chrome/locale/pl/aboutTor.properties b/src/chrome/locale/pl/aboutTor.properties
new file mode 100644
index 0000000..0bfea6f
--- /dev/null
+++ b/src/chrome/locale/pl/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Szukaj <a href="%1$S">bezpiecznie</a> z <a href="%2$S">Strona startowa</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Szukaj <a href="%1$S">bezpiecznie</a> z <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/pms/aboutTor.dtd b/src/chrome/locale/pms/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/pms/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/pms/aboutTor.properties b/src/chrome/locale/pms/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/pms/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ps/aboutTor.dtd b/src/chrome/locale/ps/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ps/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/ps/aboutTor.properties b/src/chrome/locale/ps/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ps/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/pt-BR/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/pt-BR/aboutTor.properties b/src/chrome/locale/pt-BR/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/pt-BR/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/pt/aboutTor.dtd b/src/chrome/locale/pt/aboutTor.dtd
index 4cbd760..05e9d84 100644
--- a/src/chrome/locale/pt/aboutTor.dtd
+++ b/src/chrome/locale/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 "&amp;nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;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/src/chrome/locale/pt/aboutTor.properties b/src/chrome/locale/pt/aboutTor.properties
new file mode 100644
index 0000000..153401d
--- /dev/null
+++ b/src/chrome/locale/pt/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Procurar <a href="%1$S">de forma segura</a> com <a href="%2$S">PÃ¡gina inicial</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Procurar <a href="%1$S">de forma segura</a> com <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ro/aboutTor.dtd b/src/chrome/locale/ro/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ro/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/ro/aboutTor.properties b/src/chrome/locale/ro/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ro/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd
index 0d53ea3..efe3ff1 100644
--- a/src/chrome/locale/ru/aboutTor.dtd
+++ b/src/chrome/locale/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 "&amp;nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "with">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with">
-<!ENTITY aboutTor.searchSP.search.label "Ð?Ð°Ñ?Ð°Ð»Ñ?Ð½Ð°Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "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 "Ð¡Ñ?Ñ?Ð°Ð½Ð° &amp; IP-Ð°Ð´Ñ?ÐµÑ?">
diff --git a/src/chrome/locale/ru/aboutTor.properties b/src/chrome/locale/ru/aboutTor.properties
new file mode 100644
index 0000000..53e1de4
--- /dev/null
+++ b/src/chrome/locale/ru/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Ð?Ð¾Ð¸Ñ?Ðº <a href="%1$S">Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾</a> with <a href="%2$S">Ð?Ð°Ñ?Ð°Ð»Ñ?Ð½Ð°Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Ð?Ð¾Ð¸Ñ?Ðº <a href="%1$S">Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/sco/aboutTor.dtd b/src/chrome/locale/sco/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/sco/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/sco/aboutTor.properties b/src/chrome/locale/sco/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/sco/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/sk/aboutTor.dtd b/src/chrome/locale/sk/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/sk/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/sk/aboutTor.properties b/src/chrome/locale/sk/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/sk/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/sl/aboutTor.dtd b/src/chrome/locale/sl/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/sl/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/sl/aboutTor.properties b/src/chrome/locale/sl/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/sl/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/so/aboutTor.dtd b/src/chrome/locale/so/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/so/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/so/aboutTor.properties b/src/chrome/locale/so/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/so/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/son/aboutTor.dtd b/src/chrome/locale/son/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/son/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/son/aboutTor.properties b/src/chrome/locale/son/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/son/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/sq/aboutTor.dtd b/src/chrome/locale/sq/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/sq/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/sq/aboutTor.properties b/src/chrome/locale/sq/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/sq/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/sr/aboutTor.dtd b/src/chrome/locale/sr/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/sr/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/sr/aboutTor.properties b/src/chrome/locale/sr/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/sr/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/st/aboutTor.dtd b/src/chrome/locale/st/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/st/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/st/aboutTor.properties b/src/chrome/locale/st/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/st/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/su/aboutTor.dtd b/src/chrome/locale/su/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/su/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/su/aboutTor.properties b/src/chrome/locale/su/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/su/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/sv/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/sv/aboutTor.properties b/src/chrome/locale/sv/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/sv/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/sw/aboutTor.dtd b/src/chrome/locale/sw/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/sw/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/sw/aboutTor.properties b/src/chrome/locale/sw/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/sw/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ta/aboutTor.dtd b/src/chrome/locale/ta/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ta/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/ta/aboutTor.properties b/src/chrome/locale/ta/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ta/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/te/aboutTor.dtd b/src/chrome/locale/te/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/te/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/te/aboutTor.properties b/src/chrome/locale/te/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/te/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/tg/aboutTor.dtd b/src/chrome/locale/tg/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/tg/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/tg/aboutTor.properties b/src/chrome/locale/tg/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/tg/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/th/aboutTor.dtd b/src/chrome/locale/th/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/th/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/th/aboutTor.properties b/src/chrome/locale/th/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/th/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ti/aboutTor.dtd b/src/chrome/locale/ti/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ti/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/ti/aboutTor.properties b/src/chrome/locale/ti/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ti/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/tk/aboutTor.dtd b/src/chrome/locale/tk/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/tk/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/tk/aboutTor.properties b/src/chrome/locale/tk/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/tk/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/tr/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/tr/aboutTor.properties b/src/chrome/locale/tr/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/tr/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/uk/aboutTor.dtd b/src/chrome/locale/uk/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/uk/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/uk/aboutTor.properties b/src/chrome/locale/uk/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/uk/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ur/aboutTor.dtd b/src/chrome/locale/ur/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ur/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/ur/aboutTor.properties b/src/chrome/locale/ur/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ur/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ve/aboutTor.dtd b/src/chrome/locale/ve/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ve/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/ve/aboutTor.properties b/src/chrome/locale/ve/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ve/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd
index 2987c1b..7aa92ba 100644
--- a/src/chrome/locale/vi/aboutTor.dtd
+++ b/src/chrome/locale/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 "">
 <!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
 
 <!ENTITY aboutTor.torInfo1.label "">
 <!ENTITY aboutTor.torInfo2.label "">
diff --git a/src/chrome/locale/vi/aboutTor.properties b/src/chrome/locale/vi/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/vi/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/wa/aboutTor.dtd b/src/chrome/locale/wa/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/wa/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/wa/aboutTor.properties b/src/chrome/locale/wa/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/wa/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/wo/aboutTor.dtd b/src/chrome/locale/wo/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/wo/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/wo/aboutTor.properties b/src/chrome/locale/wo/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/wo/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd
index 7a0a3d0..5d06afd 100644
--- a/src/chrome/locale/zh-CN/aboutTor.dtd
+++ b/src/chrome/locale/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 "&amp;nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;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/src/chrome/locale/zh-CN/aboutTor.properties b/src/chrome/locale/zh-CN/aboutTor.properties
new file mode 100644
index 0000000..dc346d6
--- /dev/null
+++ b/src/chrome/locale/zh-CN/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=æ??ç´¢ <a href="%1$S">å®?å?¨</a> å¼?æ?? <a href="%2$S">Startpage</a>ã??
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=æ??ç´¢ <a href="%1$S">å®?å?¨</a> å¼?æ?? <a href="%2$S">DuckDuckGo</a>ã??
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/zh-HK/aboutTor.dtd b/src/chrome/locale/zh-HK/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/zh-HK/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/zh-HK/aboutTor.properties b/src/chrome/locale/zh-HK/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/zh-HK/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/zh-TW/aboutTor.dtd b/src/chrome/locale/zh-TW/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/zh-TW/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/zh-TW/aboutTor.properties b/src/chrome/locale/zh-TW/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/zh-TW/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/zu/aboutTor.dtd b/src/chrome/locale/zu/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/zu/aboutTor.dtd
+++ b/src/chrome/locale/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:
   -->
@@ -24,23 +24,6 @@
 <!ENTITY aboutTor.search.label "Search">
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/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 "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!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 &amp; IP Address:">
diff --git a/src/chrome/locale/zu/aboutTor.properties b/src/chrome/locale/zu/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/zu/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/

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

Prev by Author: [tor-commits] [torbutton/master] Merge remote-tracking branch 'brade/bug10398'
Next by Author: [tor-commits] [tor-browser-bundle/master] Bug #11190: Switch linux PT build process to python2.
Previous by thread: [tor-commits] [torbutton/master] Merge remote-tracking branch 'brade/bug10398'
Next by thread: [tor-commits] [tor-browser-bundle/master] Bug #11190: Switch linux PT build process to python2.
Index(es):
- Author
- Thread