[tor-commits] [torbutton/master] Bug 7494: Create local home page for TBB.

[mikeperry at torproject.org]

commit 957be01ab4dd6199f3a3e1a5777c2f38c4cce09c
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Mon Jun 3 10:34:01 2013 -0400

    Bug 7494: Create local home page for TBB.
    
    Avoid empty entity strings in DTD and add explanation for translators.
    Remove trailing ? from Startpage privacy URL.
---
 src/chrome/content/aboutTor/aboutTor.xhtml |    3 +--
 src/chrome/locale/en/aboutTor.dtd          |   21 +++++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml
index f3d07a6..e948edc 100644
--- a/src/chrome/content/aboutTor/aboutTor.xhtml
+++ b/src/chrome/content/aboutTor/aboutTor.xhtml
@@ -83,8 +83,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.search.beforeLink.label;
-     <a href="&aboutTor.searchSP.search.link;">&aboutTor.searchSP.search.label;</a></h4>
+  <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>
   </form>
 </div>
 
diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd
index 2fc51c6..12300c6 100644
--- a/src/chrome/locale/en/aboutTor.dtd
+++ b/src/chrome/locale/en/aboutTor.dtd
@@ -22,19 +22,28 @@
 <!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "Search">
+
+<!-- Note to translators: the following 18 entities are used to construct a
+   - sentence (either the SP or DDG entities are used, but not both at the
+   - 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/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.searchSP.privacy.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.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/">