[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

translation at torproject.org translation at torproject.org
Tue Jul 28 19:17:39 UTC 2015


commit 0f0b6a7045813265c8ad44d3a403c4560fd7ca1d
Author: Translation commit bot <translation at torproject.org>
Date:   Tue Jul 28 19:17:39 2015 +0000

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

diff --git a/ach/abouttor.properties b/ach/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ach/abouttor.properties
+++ b/ach/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/ady/abouttor.properties b/ady/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ady/abouttor.properties
+++ b/ady/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/af/abouttor.properties b/af/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/af/abouttor.properties
+++ b/af/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/ak/abouttor.properties b/ak/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ak/abouttor.properties
+++ b/ak/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/am/abouttor.properties b/am/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/am/abouttor.properties
+++ b/am/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/ar/abouttor.properties b/ar/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ar/abouttor.properties
+++ b/ar/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/arn/abouttor.properties b/arn/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/arn/abouttor.properties
+++ b/arn/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/ast/abouttor.properties b/ast/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ast/abouttor.properties
+++ b/ast/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/az/abouttor.properties b/az/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/az/abouttor.properties
+++ b/az/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/ba/abouttor.properties b/ba/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ba/abouttor.properties
+++ b/ba/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/be/abouttor.properties b/be/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/be/abouttor.properties
+++ b/be/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/bg/abouttor.properties b/bg/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/bg/abouttor.properties
+++ b/bg/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/bn/abouttor.properties b/bn/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/bn/abouttor.properties
+++ b/bn/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/bn_IN/abouttor.properties b/bn_IN/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/bn_IN/abouttor.properties
+++ b/bn_IN/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/bo/abouttor.properties b/bo/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/bo/abouttor.properties
+++ b/bo/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/br/abouttor.properties b/br/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/br/abouttor.properties
+++ b/br/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/bs/abouttor.properties b/bs/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/bs/abouttor.properties
+++ b/bs/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/ca/abouttor.properties b/ca/abouttor.properties
index 2dc8ac2..411e962 100644
--- a/ca/abouttor.properties
+++ b/ca/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Cerca<a href="%1$S">de forma segura</a>amb<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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Cerca <a href="%1$S">de forma segura</a> amb <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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Cerca <a href="%1$S">de forma segura</a>  amb <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/cs/abouttor.properties b/cs/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/cs/abouttor.properties
+++ b/cs/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/csb/abouttor.properties b/csb/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/csb/abouttor.properties
+++ b/csb/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/cv/abouttor.properties b/cv/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/cv/abouttor.properties
+++ b/cv/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/cy/abouttor.properties b/cy/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/cy/abouttor.properties
+++ b/cy/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/cy_GB/abouttor.properties b/cy_GB/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/cy_GB/abouttor.properties
+++ b/cy_GB/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/da/abouttor.properties b/da/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/da/abouttor.properties
+++ b/da/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/de/abouttor.properties b/de/abouttor.properties
index 6045d3f..b7fc4bf 100644
--- a/de/abouttor.properties
+++ b/de/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//DE"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'>
-<head>
-<title>torbutton Firefox Extension für sicheres Netzsurfen bei der Nutzung von Tor
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox Extension für sicheres Netzsurfen bei der Nutzung von Tor</td><td class='sub right'>Das Tor Projekt</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox Extension für sicheres Netzsurfen bei der Nutzung von Tor</td><td class='sub right'>Das Tor Projekt</td></tr></table>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
+aboutTor.searchSP.privacy=<a href="%1$S">Sicheres</a> Suchen 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/
 
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
+aboutTor.searchDDG.privacy=<a href="%1$S">Sicheres</a> Suchen 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/
 
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=<a href="%1$S">Sicheres</a> Suchen mit <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/dz/abouttor.properties b/dz/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/dz/abouttor.properties
+++ b/dz/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/el/abouttor.properties b/el/abouttor.properties
index 2dc8ac2..15e7637 100644
--- a/el/abouttor.properties
+++ b/el/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy= Ψάξτε <a href="%1$S"> αφαλές</a> με το <a href="%2$S">Disconnect.me</a>
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/en/abouttor.properties b/en/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/en/abouttor.properties
+++ b/en/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/en_GB/abouttor.properties b/en_GB/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/en_GB/abouttor.properties
+++ b/en_GB/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/eo/abouttor.properties b/eo/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/eo/abouttor.properties
+++ b/eo/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/es/abouttor.properties b/es/abouttor.properties
index eaf9a20..fb92251 100644
--- a/es/abouttor.properties
+++ b/es/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Extensión de Firefox para la navegación web segura al usar Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Extensión de Firefox para la navegación web segura al usar Tor</td><td class='sub right'>El proyecto Tor</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Extensión de Firefox para la navegación web segura al usar Tor</td><td class='sub right'>El proyecto Tor</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
+aboutTor.searchSP.privacy=Busque <a href="%1$S">de forma segura</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/
 
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
+aboutTor.searchDDG.privacy=Busque <a href="%1$S">de forma segura</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?kl=-es
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/?kl=-es
 
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Busque <a href="%1$S">de forma segura</a> con <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/es_AR/abouttor.properties b/es_AR/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/es_AR/abouttor.properties
+++ b/es_AR/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/es_CL/abouttor.properties b/es_CL/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/es_CL/abouttor.properties
+++ b/es_CL/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/es_CO/abouttor.properties b/es_CO/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/es_CO/abouttor.properties
+++ b/es_CO/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/es_MX/abouttor.properties b/es_MX/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/es_MX/abouttor.properties
+++ b/es_MX/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/et/abouttor.properties b/et/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/et/abouttor.properties
+++ b/et/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/eu/abouttor.properties b/eu/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/eu/abouttor.properties
+++ b/eu/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/fa/abouttor.properties b/fa/abouttor.properties
index 1bd5889..54e04d9 100644
--- a/fa/abouttor.properties
+++ b/fa/abouttor.properties
@@ -1,151 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=جستجو <a href="%1$S">ایمن</a> با <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/fi/abouttor.properties b/fi/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/fi/abouttor.properties
+++ b/fi/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/fil/abouttor.properties b/fil/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/fil/abouttor.properties
+++ b/fil/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/fo/abouttor.properties b/fo/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/fo/abouttor.properties
+++ b/fo/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/fr/abouttor.properties b/fr/abouttor.properties
index 873a85b..ec59d81 100644
--- a/fr/abouttor.properties
+++ b/fr/abouttor.properties
@@ -1,151 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - extension Firefox pour naviguer de manière sûre pendant l'utilisatoin de Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>l'extension Firefox pour naviguer en sûreté lors de l'utilisation de Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>l'extension Firefox pour naviguer en sûreté lors de l'utilisation de Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
+aboutTor.searchSP.privacy=Rechercher <a href="%1$S">de manière sécurisée</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/
 
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
+aboutTor.searchDDG.privacy=Rechercher <a href="%1$S">de manière sécurisée</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/
 
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Rechercher <a href="%1$S">de manière sécurisée</a> avec <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/fr_CA/abouttor.properties b/fr_CA/abouttor.properties
index fc95bed..3bfec1d 100644
--- a/fr_CA/abouttor.properties
+++ b/fr_CA/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//FR"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='fr' lang='fr'>
-<head>
-<title>torbutton - Modules Firefox pour une navigation Web sécuritaire en utilisant Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Modules Firefox pour une navigation Web sécuritaire en utilisant Tor</td><td class='sub right'>Le projet Tor</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Modules Firefox pour une navigation Web sécuritaire en utilisant Tor</td><td class='sub right'>Le projet Tor</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
+aboutTor.searchSP.privacy=Recherchez <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/fra/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/fra/?
 
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
+aboutTor.searchDDG.privacy=Recherchez <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/
 
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Recherchez <a href="%1$S">en toute sécurité</a> avec <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/fur/abouttor.properties b/fur/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/fur/abouttor.properties
+++ b/fur/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/fy/abouttor.properties b/fy/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/fy/abouttor.properties
+++ b/fy/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/ga/abouttor.properties b/ga/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ga/abouttor.properties
+++ b/ga/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/gd/abouttor.properties b/gd/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/gd/abouttor.properties
+++ b/gd/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight  { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+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/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/gl/abouttor.properties b/gl/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/gl/abouttor.properties
+++ b/gl/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torb