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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
From: translation@xxxxxxxxxxxxxx
Date: Tue, 28 Jul 2015 19:17:39 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 28 Jul 2015 15:19:56 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 0f0b6a7045813265c8ad44d3a403c4560fd7ca1d
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
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@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@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@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='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/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/gu/abouttor.properties b/gu/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/gu/abouttor.properties
+++ b/gu/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/gu_IN/abouttor.properties b/gu_IN/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/gu_IN/abouttor.properties
+++ b/gu_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/gun/abouttor.properties b/gun/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/gun/abouttor.properties
+++ b/gun/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/ha/abouttor.properties b/ha/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ha/abouttor.properties
+++ b/ha/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/he/abouttor.properties b/he/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/he/abouttor.properties
+++ b/he/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/hi/abouttor.properties b/hi/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/hi/abouttor.properties
+++ b/hi/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/hr/abouttor.properties b/hr/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/hr/abouttor.properties
+++ b/hr/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/hr_HR/abouttor.properties b/hr_HR/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/hr_HR/abouttor.properties
+++ b/hr_HR/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/ht/abouttor.properties b/ht/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ht/abouttor.properties
+++ b/ht/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/hu/abouttor.properties b/hu/abouttor.properties
index f8cf53c..5c16ddc 100644
--- a/hu/abouttor.properties
+++ b/hu/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 kiterjesztÃ©s a biztonsÃ¡gos webbÃ¶ngÃ©szÃ©sÃ©rt Tor hasznÃ¡latÃ¡nÃ¡l</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 kiterjesztÃ©s a biztonsÃ¡gos webbÃ¶ngÃ©szÃ©sÃ©rt Tor hasznÃ¡latÃ¡nÃ¡l</td><td class='sub right'>A 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 kiterjesztÃ©s a biztonsÃ¡gos webbÃ¶ngÃ©szÃ©sÃ©rt Tor hasznÃ¡latÃ¡nÃ¡l</td><td class='sub right'>A 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"># NÃ©zd meg a LICENSE-t a licenszelÃ©si informÃ¡ciÃ³hoz.</span>
-<span class="c"># NÃ©zd meg a LICENSE-t a licenszelÃ©si informÃ¡ciÃ³hoz.</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"># NÃ©zd meg a LICENSE-t a licenszelÃ©si informÃ¡ciÃ³hoz.</span>
-<span class="c"># NÃ©zd meg a LICENSE-t a licenszelÃ©si informÃ¡ciÃ³hoz.</span>
-<span class="c"># NÃ©zd meg a LICENSE-t a licenszelÃ©si informÃ¡ciÃ³hoz.</span>
-<span class="c"># NÃ©zd meg a LICENSE-t a licenszelÃ©si informÃ¡ciÃ³hoz.</span>
-<span class="c"># NÃ©zd meg a LICENSE-t a licenszelÃ©si informÃ¡ciÃ³hoz.</span>
+aboutTor.searchSP.privacy=KeresÃ©s <a href="%1$S">biztonsÃ¡gosan</a> a <a href="%2$S">Startpage -gel</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"># NÃ©zd meg a LICENSE-t a licenszelÃ©si informÃ¡ciÃ³hoz.</span>
-<span class="c"># NÃ©zd meg a LICENSE-t a licenszelÃ©si informÃ¡ciÃ³hoz.</span>
-<span class="c"># NÃ©zd meg a LICENSE-t a licenszelÃ©si informÃ¡ciÃ³hoz.</span>
-<span class="c"># NÃ©zd meg a LICENSE-t a licenszelÃ©si informÃ¡ciÃ³hoz.</span>
-<span class="c"># NÃ©zd meg a LICENSE-t a licenszelÃ©si informÃ¡ciÃ³hoz.</span>
+aboutTor.searchDDG.privacy=KeresÃ©s <a href="%1$S">biztonsÃ¡gosan</a> a <a href="%2$S">DuckDuckGo -val</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"># NÃ©zd meg a LICENSE-t a licenszelÃ©si informÃ¡ciÃ³hoz.</span>
-<span class="c"># NÃ©zd meg a LICENSE-t a licenszelÃ©si informÃ¡ciÃ³hoz.</span>
-<span class="c"># NÃ©zd meg a LICENSE-t a licenszelÃ©si informÃ¡ciÃ³hoz.</span>
-<span class="c"># NÃ©zd meg a LICENSE-t a licenszelÃ©si informÃ¡ciÃ³hoz.</span>
-<span class="c"># NÃ©zd meg a LICENSE-t a licenszelÃ©si informÃ¡ciÃ³hoz.</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=KeresÃ©s <a href="%1$S">biztonsÃ¡gosan</a> a <a href="%2$S">Disconnect.me -vel</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/hy/abouttor.properties b/hy/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/hy/abouttor.properties
+++ b/hy/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/hy_AM/abouttor.properties b/hy_AM/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/hy_AM/abouttor.properties
+++ b/hy_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/ia/abouttor.properties b/ia/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ia/abouttor.properties
+++ b/ia/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/id/abouttor.properties b/id/abouttor.properties
index 36a9d90..a3d7ab7 100644
--- a/id/abouttor.properties
+++ b/id/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='id' lang='id'>
-<head>
-<title>torbutton - Ekstensi firefox untuk menjelajah web dengan aman saat menggunakan 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'>Ekstensi Firefox untuk menjelajah web dengan aman saat menggunakan 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'>Ekstensi Firefox untuk menjelajah web dengan aman saat menggunakan 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"># Baca LICENSE untuk informasi lisensi.</span>
-<span class="c"># Baca LICENSE untuk informasi lisensi.</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"># Baca LICENSE untuk informasi lisensi.</span>
-<span class="c"># Baca LICENSE untuk informasi lisensi.</span>
-<span class="c"># Baca LICENSE untuk informasi lisensi.</span>
-<span class="c"># Baca LICENSE untuk informasi lisensi.</span>
-<span class="c"># Baca LICENSE untuk informasi lisensi.</span>
+aboutTor.searchSP.privacy=Cari <a href="%1$S">secara aman</a> dengan <a href="%2$S">Halaman Awal</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://halamanawal.com/ind/lindungi-privasi.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://halamanawal.com/
 
-<span class="c"># Baca LICENSE untuk informasi lisensi.</span>
-<span class="c"># Baca LICENSE untuk informasi lisensi.</span>
-<span class="c"># Baca LICENSE untuk informasi lisensi.</span>
-<span class="c"># Baca LICENSE untuk informasi lisensi.</span>
-<span class="c"># Baca LICENSE untuk informasi lisensi.</span>
+aboutTor.searchDDG.privacy=Cari <a href="%1$S">secara aman</a> dengan <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privasi.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
-<span class="c"># Baca LICENSE untuk informasi lisensi.</span>
-<span class="c"># Baca LICENSE untuk informasi lisensi.</span>
-<span class="c"># Baca LICENSE untuk informasi lisensi.</span>
-<span class="c"># Baca LICENSE untuk informasi lisensi.</span>
-<span class="c"># Baca LICENSE untuk informasi lisensi.</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=Cari <a href="%1$S">secara aman</a> dengan <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/privasi
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://cari.disconnect.me/
diff --git a/is/abouttor.properties b/is/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/is/abouttor.properties
+++ b/is/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/it/abouttor.properties b/it/abouttor.properties
index 2950542..db49b15 100644
--- a/it/abouttor.properties
+++ b/it/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='it' lang='it'>
-<head>
-<title>torbutton - Estensione Firefox per navigare in modo sicuro mentre si usa 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'>Estensione Firefox per navigare in modo sicuro mentre si usa 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'>Estensione Firefox per navigare in modo sicuro mentre si usa 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"># Vedi LICENSE per informazioni sulla licenza.</span>
-<span class="c"># Vedi LICENSE per informazioni sulla licenza.</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"># Vedi LICENSE per informazioni sulla licenza.</span>
-<span class="c"># Vedi LICENSE per informazioni sulla licenza.</span>
-<span class="c"># Vedi LICENSE per informazioni sulla licenza.</span>
-<span class="c"># Vedi LICENSE per informazioni sulla licenza.</span>
-<span class="c"># Vedi LICENSE per informazioni sulla licenza.</span>
+aboutTor.searchSP.privacy=Cerca <a href="%1$S"> in sicurezza</a>con<a href="%2$S">Starpage</a>
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/ita/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
 
-<span class="c"># Vedi LICENSE per informazioni sulla licenza.</span>
-<span class="c"># Vedi LICENSE per informazioni sulla licenza.</span>
-<span class="c"># Vedi LICENSE per informazioni sulla licenza.</span>
-<span class="c"># Vedi LICENSE per informazioni sulla licenza.</span>
-<span class="c"># Vedi LICENSE per informazioni sulla licenza.</span>
+aboutTor.searchDDG.privacy=Cerca <a href="%1$S">in modo sicuro</a> con <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
-<span class="c"># Vedi LICENSE per informazioni sulla licenza.</span>
-<span class="c"># Vedi LICENSE per informazioni sulla licenza.</span>
-<span class="c"># Vedi LICENSE per informazioni sulla licenza.</span>
-<span class="c"># Vedi LICENSE per informazioni sulla licenza.</span>
-<span class="c"># Vedi LICENSE per informazioni sulla licenza.</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"> in sicurezza </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/ja/abouttor.properties b/ja/abouttor.properties
index 2dc8ac2..ed1ecc6 100644
--- a/ja/abouttor.properties
+++ b/ja/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="%2$S">Startpage</a>ã?§<a href="%1$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="%2$S">DuckDuckGo</a>ã?§<a href="%1$S">å®?å?¨ã?«</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="%2$S">Disconnect.me</a>ã?§<a href="%1$S">å®?å?¨ã?«</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/jbo/abouttor.properties b/jbo/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/jbo/abouttor.properties
+++ b/jbo/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/jv/abouttor.properties b/jv/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/jv/abouttor.properties
+++ b/jv/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/ka/abouttor.properties b/ka/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ka/abouttor.properties
+++ b/ka/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/kk/abouttor.properties b/kk/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/kk/abouttor.properties
+++ b/kk/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/km/abouttor.properties b/km/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/km/abouttor.properties
+++ b/km/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/kn/abouttor.properties b/kn/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/kn/abouttor.properties
+++ b/kn/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/ko/abouttor.properties b/ko/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ko/abouttor.properties
+++ b/ko/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/ko_KR/abouttor.properties b/ko_KR/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ko_KR/abouttor.properties
+++ b/ko_KR/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/ku/abouttor.properties b/ku/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ku/abouttor.properties
+++ b/ku/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/ku_IQ/abouttor.properties b/ku_IQ/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ku_IQ/abouttor.properties
+++ b/ku_IQ/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/kw/abouttor.properties b/kw/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/kw/abouttor.properties
+++ b/kw/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/ky/abouttor.properties b/ky/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ky/abouttor.properties
+++ b/ky/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/la/abouttor.properties b/la/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/la/abouttor.properties
+++ b/la/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/lb/abouttor.properties b/lb/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/lb/abouttor.properties
+++ b/lb/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/lg/abouttor.properties b/lg/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/lg/abouttor.properties
+++ b/lg/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/ln/abouttor.properties b/ln/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ln/abouttor.properties
+++ b/ln/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/lo/abouttor.properties b/lo/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/lo/abouttor.properties
+++ b/lo/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/lt/abouttor.properties b/lt/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/lt/abouttor.properties
+++ b/lt/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/lv/abouttor.properties b/lv/abouttor.properties
index 762f38a..36269de 100644
--- a/lv/abouttor.properties
+++ b/lv/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 paplaÅ¡inÄ?jums droÅ¡ai tÄ«mekÄ¼a pÄ?rlÅ«koÅ¡anai, lietojot  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 paplaÅ¡inÄ?jums droÅ¡ai tÄ«mekÄ¼a pÄ?rlÅ«koÅ¡anai, lietojot 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 paplaÅ¡inÄ?jums droÅ¡ai tÄ«mekÄ¼a pÄ?rlÅ«koÅ¡anai, lietojot 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"># LicencÄ?Å¡anas informÄ?cijai skatÄ«t  LICENCE.</span>
-<span class="c"># LicencÄ?Å¡anas informÄ?cijai skatÄ«t  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"># LicencÄ?Å¡anas informÄ?cijai skatÄ«t  LICENCE.</span>
-<span class="c"># LicencÄ?Å¡anas informÄ?cijai skatÄ«t  LICENCE.</span>
-<span class="c"># LicencÄ?Å¡anas informÄ?cijai skatÄ«t  LICENCE.</span>
-<span class="c"># LicencÄ?Å¡anas informÄ?cijai skatÄ«t  LICENCE.</span>
-<span class="c"># LicencÄ?Å¡anas informÄ?cijai skatÄ«t  LICENCE.</span>
+aboutTor.searchSP.privacy=MeklÄ?t <a href="%1$S">droÅ¡i</a> izmantojot <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"># LicencÄ?Å¡anas informÄ?cijai skatÄ«t  LICENCE.</span>
-<span class="c"># LicencÄ?Å¡anas informÄ?cijai skatÄ«t  LICENCE.</span>
-<span class="c"># LicencÄ?Å¡anas informÄ?cijai skatÄ«t  LICENCE.</span>
-<span class="c"># LicencÄ?Å¡anas informÄ?cijai skatÄ«t  LICENCE.</span>
-<span class="c"># LicencÄ?Å¡anas informÄ?cijai skatÄ«t  LICENCE.</span>
+aboutTor.searchDDG.privacy=MeklÄ?t <a href="%1$S">droÅ¡i</a> izmantojot <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"># LicencÄ?Å¡anas informÄ?cijai skatÄ«t  LICENCE.</span>
-<span class="c"># LicencÄ?Å¡anas informÄ?cijai skatÄ«t  LICENCE.</span>
-<span class="c"># LicencÄ?Å¡anas informÄ?cijai skatÄ«t  LICENCE.</span>
-<span class="c"># LicencÄ?Å¡anas informÄ?cijai skatÄ«t  LICENCE.</span>
-<span class="c"># LicencÄ?Å¡anas informÄ?cijai skatÄ«t  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=MeklÄ?t <a href="%1$S">droÅ¡i</a> izmantojot <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/mg/abouttor.properties b/mg/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/mg/abouttor.properties
+++ b/mg/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/mi/abouttor.properties b/mi/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/mi/abouttor.properties
+++ b/mi/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/mk/abouttor.properties b/mk/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/mk/abouttor.properties
+++ b/mk/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/ml/abouttor.properties b/ml/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ml/abouttor.properties
+++ b/ml/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/mn/abouttor.properties b/mn/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/mn/abouttor.properties
+++ b/mn/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/mr/abouttor.properties b/mr/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/mr/abouttor.properties
+++ b/mr/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/ms_MY/abouttor.properties b/ms_MY/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ms_MY/abouttor.properties
+++ b/ms_MY/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/mt/abouttor.properties b/mt/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/mt/abouttor.properties
+++ b/mt/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/my/abouttor.properties b/my/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/my/abouttor.properties
+++ b/my/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/nah/abouttor.properties b/nah/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/nah/abouttor.properties
+++ b/nah/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/nap/abouttor.properties b/nap/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/nap/abouttor.properties
+++ b/nap/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/nb/abouttor.properties b/nb/abouttor.properties
index bf0ecc0..4cf78cd 100644
--- a/nb/abouttor.properties
+++ b/nb/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 - Programtillegg for Firefox for sikker nettsurfing ved bruk av 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'>Programtillegg for Firefox for sikker nettsurfing ved bruk av Tor</title>\n- Firefox extension for safe web browsing while using Tor</td><td class='sub right'>Tor-prosjektett</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/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'>Programtillegg for Firefox for sikker nettsurfing ved bruk av Tor</title>\n- Firefox extension for safe web browsing while using Tor</td><td class='sub right'>Tor-prosjektett</td></tr></table>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>sammendrag</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>logg</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>forgreining</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/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"># Se LICENSE for lisensinformasjon.</span>
-<span class="c"># Se LICENSE for lisensinformasjon.</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"># Se LICENSE for lisensinformasjon.</span>
-<span class="c"># Se LICENSE for lisensinformasjon.</span>
-<span class="c"># Se LICENSE for lisensinformasjon.</span>
-<span class="c"># Se LICENSE for lisensinformasjon.</span>
-<span class="c"># Se LICENSE for lisensinformasjon.</span>
+aboutTor.searchSP.privacy=SÃ¸k <a href="%1$S">sikkert</a> med <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"># Se LICENSE for lisensinformasjon.</span>
-<span class="c"># Se LICENSE for lisensinformasjon.</span>
-<span class="c"># Se LICENSE for lisensinformasjon.</span>
-<span class="c"># Se LICENSE for lisensinformasjon.</span>
-<span class="c"># Se LICENSE for lisensinformasjon.</span>
+aboutTor.searchDDG.privacy=SÃ¸k <a href="%1$S">sikkert</a> med <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"># Se LICENSE for lisensinformasjon.</span>
-<span class="c"># Se LICENSE for lisensinformasjon.</span>
-<span class="c"># Se LICENSE for lisensinformasjon.</span>
-<span class="c"># Se LICENSE for lisensinformasjon.</span>
-<span class="c"># Se LICENSE for lisensinformasjon.</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=SÃ¸k <a href="%1$S">sikkert</a> med <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/nds/abouttor.properties b/nds/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/nds/abouttor.properties
+++ b/nds/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/ne/abouttor.properties b/ne/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ne/abouttor.properties
+++ b/ne/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/nl/abouttor.properties b/nl/abouttor.properties
index fed243b..63c49fa 100644
--- a/nl/abouttor.properties
+++ b/nl/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  
-<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">Veilig</a> zoeken met <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/ned/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
 
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># 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">Veilig</a> zoeken met <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">Veilig</a> zoeken met <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/nl_BE/abouttor.properties b/nl_BE/abouttor.properties
index 2dc8ac2..d68e8c1 100644
--- a/nl_BE/abouttor.properties
+++ b/nl_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/ned/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/nn/abouttor.properties b/nn/abouttor.properties
index 2dc8ac2..c4313d6 100644
--- a/nn/abouttor.properties
+++ b/nn/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=SÃ¸k <a href="%1$S">trygt</a> med <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=SeÃ¸k <a href="%1$S">trygt</a> med <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=SÃ¸k <a href="%1$S">trygt</a> med <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/nso/abouttor.properties b/nso/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/nso/abouttor.properties
+++ b/nso/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/oc/abouttor.properties b/oc/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/oc/abouttor.properties
+++ b/oc/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/or/abouttor.properties b/or/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/or/abouttor.properties
+++ b/or/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/pa/abouttor.properties b/pa/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/pa/abouttor.properties
+++ b/pa/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/pap/abouttor.properties b/pap/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/pap/abouttor.properties
+++ b/pap/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/pl/abouttor.properties b/pl/abouttor.properties
index 3ce1fa1..9bf0dcd 100644
--- a/pl/abouttor.properties
+++ b/pl/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 - Dodatek do Firefoxa dla bezpieczniejszego przeglÄ?dania stron internetowych podczas uÅ¼ywania Tora</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'>Dodatek do Firefoxa dla bezpieczniejszego przeglÄ?dania stron internetowych podczas uÅ¼ywania Tora</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'>Dodatek do Firefoxa dla bezpieczniejszego przeglÄ?dania stron internetowych podczas uÅ¼ywania Tora</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"># Zobacz LICENCJA dla informacji o licencji.</span>
-<span class="c"># Zobacz LICENCJA dla informacji o licencji.</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"># Zobacz LICENCJA dla informacji o licencji.</span>
-<span class="c"># Zobacz LICENCJA dla informacji o licencji.</span>
-<span class="c"># Zobacz LICENCJA dla informacji o licencji.</span>
-<span class="c"># Zobacz LICENCJA dla informacji o licencji.</span>
-<span class="c"># Zobacz LICENCJA dla informacji o licencji.</span>
+aboutTor.searchSP.privacy=Szukaj <a href="%1$S">bezpiecznie</a> uÅ¼ywajÄ?c wyszukiwarki <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"># Zobacz LICENCJA dla informacji o licencji.</span>
-<span class="c"># Zobacz LICENCJA dla informacji o licencji.</span>
-<span class="c"># Zobacz LICENCJA dla informacji o licencji.</span>
-<span class="c"># Zobacz LICENCJA dla informacji o licencji.</span>
-<span class="c"># Zobacz LICENCJA dla informacji o licencji.</span>
+aboutTor.searchDDG.privacy=Szukaj <a href="%1$S">bezpiecznie</a> uÅ¼ywajÄ?c wyszukiwarki <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"># Zobacz LICENCJA dla informacji o licencji.</span>
-<span class="c"># Zobacz LICENCJA dla informacji o licencji.</span>
-<span class="c"># Zobacz LICENCJA dla informacji o licencji.</span>
-<span class="c"># Zobacz LICENCJA dla informacji o licencji.</span>
-<span class="c"># Zobacz LICENCJA dla informacji o licencji.</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=Szukaj <a href="%1$S">bezpiecznie</a> uÅ¼ywajÄ?c wyszukiwarki <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/pms/abouttor.properties b/pms/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/pms/abouttor.properties
+++ b/pms/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/ps/abouttor.properties b/ps/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ps/abouttor.properties
+++ b/ps/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/pt/abouttor.properties b/pt/abouttor.properties
index 1e808fe..7bf9d5d 100644
--- a/pt/abouttor.properties
+++ b/pt/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//PT"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='pt'>
-<head>
-<title>torbutton - ExtensÃ£o do Firefox para navegar com seguranÃ§a na Web enquanto utiliza o 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'>- ExtensÃ£o do Firefox para navegar com seguranÃ§a na Web enquanto utiliza o Tor</td><td class='sub right'>O Projeto 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'>- ExtensÃ£o do Firefox para navegar com seguranÃ§a na Web enquanto utiliza o Tor</td><td class='sub right'>O Projeto 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"># Consulte a LICENÃ?A para informaÃ§Ã£o sobre o licenciamento.</span>
-<span class="c"># Consulte a LICENÃ?A para informaÃ§Ã£o sobre o licenciamento.</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"># Consulte a LICENÃ?A para informaÃ§Ã£o sobre o licenciamento.</span>
-<span class="c"># Consulte a LICENÃ?A para informaÃ§Ã£o sobre o licenciamento.</span>
-<span class="c"># Consulte a LICENÃ?A para informaÃ§Ã£o sobre o licenciamento.</span>
-<span class="c"># Consulte a LICENÃ?A para informaÃ§Ã£o sobre o licenciamento.</span>
-<span class="c"># Consulte a LICENÃ?A para informaÃ§Ã£o sobre o licenciamento.</span>
+aboutTor.searchSP.privacy=Procurar com <a href="%1$S">seguranÃ§a</a> com <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"># Consulte a LICENÃ?A para informaÃ§Ã£o sobre o licenciamento.</span>
-<span class="c"># Consulte a LICENÃ?A para informaÃ§Ã£o sobre o licenciamento.</span>
-<span class="c"># Consulte a LICENÃ?A para informaÃ§Ã£o sobre o licenciamento.</span>
-<span class="c"># Consulte a LICENÃ?A para informaÃ§Ã£o sobre o licenciamento.</span>
-<span class="c"># Consulte a LICENÃ?A para informaÃ§Ã£o sobre o licenciamento.</span>
+aboutTor.searchDDG.privacy=Procurar com <a href="%1$S">seguranÃ§a</a> com <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
-<span class="c"># Consulte a LICENÃ?A para informaÃ§Ã£o sobre o licenciamento.</span>
-<span class="c"># Consulte a LICENÃ?A para informaÃ§Ã£o sobre o licenciamento.</span>
-<span class="c"># Consulte a LICENÃ?A para informaÃ§Ã£o sobre o licenciamento.</span>
-<span class="c"># Consulte a LICENÃ?A para informaÃ§Ã£o sobre o licenciamento.</span>
-<span class="c"># Consulte a LICENÃ?A para informaÃ§Ã£o sobre o licenciamento.</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=Procurar com <a href="%1$S">seguranÃ§a</a> com <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/pt_BR/abouttor.properties b/pt_BR/abouttor.properties
index 699e341..7efbe86 100644
--- a/pt_BR/abouttor.properties
+++ b/pt_BR/abouttor.properties
@@ -1,151 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//PT-BR"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='pt-br' lang='pt-br'>
-<head>
-<title>torbutton - ExtensÃ£o Firefox para navegar com seguranÃ§a ao 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 valor='gsoc2009-koryk'>gsoc2009-koryk</opÃ§Ã£o>
-<option valor='gsoc2009-koryk'>gsoc2009-koryk</opÃ§Ã£o>
-<option valor='gsoc2009-koryk'>gsoc2009-koryk</opÃ§Ã£o>
-<option valor='gsoc2009-koryk'>gsoc2009-koryk</opÃ§Ã£o>
-<option valor='gsoc2009-koryk'>gsoc2009-koryk</opÃ§Ã£o>
-<option valor='gsoc2009-koryk'>gsoc2009-koryk</opÃ§Ã£o>
-<option valor='gsoc2009-koryk'>gsoc2009-koryk</opÃ§Ã£o>
-<option valor='gsoc2009-koryk'>gsoc2009-koryk</opÃ§Ã£o>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>ExtensÃ£o Firefox para surfar na Internet  com seguranÃ§a ao utilizar 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 valor='gsoc2009-koryk'>gsoc2009-koryk</opÃ§Ã£o>
-<option valor='gsoc2009-koryk'>gsoc2009-koryk</opÃ§Ã£o>
-<option valor='gsoc2009-koryk'>gsoc2009-koryk</opÃ§Ã£o>
-<option valor='gsoc2009-koryk'>gsoc2009-koryk</opÃ§Ã£o>
-</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'>ExtensÃ£o Firefox para surfar na Internet  com seguranÃ§a ao utilizar 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"># Consultar LICENÃ?A para ler as informaÃ§Ãµes de licenÃ§a  .</span>
-<span class="c"># Consultar LICENÃ?A para ler as informaÃ§Ãµes de licenÃ§a  .</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"># Consultar LICENÃ?A para ler as informaÃ§Ãµes de licenÃ§a  .</span>
-<span class="c"># Consultar LICENÃ?A para ler as informaÃ§Ãµes de licenÃ§a  .</span>
-<span class="c"># Consultar LICENÃ?A para ler as informaÃ§Ãµes de licenÃ§a  .</span>
-<span class="c"># Consultar LICENÃ?A para ler as informaÃ§Ãµes de licenÃ§a  .</span>
-<span class="c"># Consultar LICENÃ?A para ler as informaÃ§Ãµes de licenÃ§a  .</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"># Consultar LICENÃ?A para ler as informaÃ§Ãµes de licenÃ§a  .</span>
-<span class="c"># Consultar LICENÃ?A para ler as informaÃ§Ãµes de licenÃ§a  .</span>
-<span class="c"># Consultar LICENÃ?A para ler as informaÃ§Ãµes de licenÃ§a  .</span>
-<span class="c"># Consultar LICENÃ?A para ler as informaÃ§Ãµes de licenÃ§a  .</span>
-<span class="c"># Consultar LICENÃ?A para ler as informaÃ§Ãµes de licenÃ§a  .</span>
+aboutTor.searchDDG.privacy=Buscar <a href="%1$S">com seguranÃ§a</a> utilizado <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"># Consultar LICENÃ?A para ler as informaÃ§Ãµes de licenÃ§a  .</span>
-<span class="c"># Consultar LICENÃ?A para ler as informaÃ§Ãµes de licenÃ§a  .</span>
-<span class="c"># Consultar LICENÃ?A para ler as informaÃ§Ãµes de licenÃ§a  .</span>
-<span class="c"># Consultar LICENÃ?A para ler as informaÃ§Ãµes de licenÃ§a  .</span>
-<span class="c"># Consultar LICENÃ?A para ler as informaÃ§Ãµes de licenÃ§a  .</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=Buscar <a href="%1$S">com seguranÃ§a</a> utilizando <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/ro/abouttor.properties b/ro/abouttor.properties
index 1f53bc2..6298f82 100644
--- a/ro/abouttor.properties
+++ b/ro/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 - Extensie Firefox pentru navigare sigurÄ? Ã®n timpul utilizÄ?rii 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=CÄ?utaÈ?i <a href="%1$S">sigur</a> cu <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=CÄ?utaÈ?i <a href="%1$S">sigur</a> cu <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=CÄ?utaÈ?i <a href="%1$S">sigur</a> cu <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/ru/abouttor.properties b/ru/abouttor.properties
index 6ed9fe9..6795b7c 100644
--- a/ru/abouttor.properties
+++ b/ru/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 Ð´Ð»Ñ? Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ð³Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¼Ð¾Ñ?Ñ?Ð° Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ð° Ñ? 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 Ð´Ð»Ñ? Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ð³Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¼Ð¾Ñ?Ñ?Ð° Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ð° Ñ? Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/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 Ð´Ð»Ñ? Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ð³Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¼Ð¾Ñ?Ñ?Ð° Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ð° Ñ? Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¸Ñ?Ð¾Ð³</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/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"># Ð¡Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?.</span>
-<span class="c"># Ð¡Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?.</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"># Ð¡Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?.</span>
-<span class="c"># Ð¡Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?.</span>
-<span class="c"># Ð¡Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?.</span>
-<span class="c"># Ð¡Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?.</span>
-<span class="c"># Ð¡Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?.</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"># Ð¡Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?.</span>
-<span class="c"># Ð¡Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?.</span>
-<span class="c"># Ð¡Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?.</span>
-<span class="c"># Ð¡Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?.</span>
-<span class="c"># Ð¡Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?.</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"># Ð¡Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?.</span>
-<span class="c"># Ð¡Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?.</span>
-<span class="c"># Ð¡Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?.</span>
-<span class="c"># Ð¡Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?.</span>
-<span class="c"># Ð¡Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?.</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/ru@petr1708/abouttor.properties b/ru@petr1708/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ru@petr1708/abouttor.properties
+++ b/ru@petr1708/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/sa/abouttor.properties b/sa/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/sa/abouttor.properties
+++ b/sa/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/scn/abouttor.properties b/scn/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/scn/abouttor.properties
+++ b/scn/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/sco/abouttor.properties b/sco/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/sco/abouttor.properties
+++ b/sco/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/si/abouttor.properties b/si/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/si/abouttor.properties
+++ b/si/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/si_LK/abouttor.properties b/si_LK/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/si_LK/abouttor.properties
+++ b/si_LK/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/sk/abouttor.properties b/sk/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/sk/abouttor.properties
+++ b/sk/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/sk_SK/abouttor.properties b/sk_SK/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/sk_SK/abouttor.properties
+++ b/sk_SK/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/sl/abouttor.properties b/sl/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/sl/abouttor.properties
+++ b/sl/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/sl_SI/abouttor.properties b/sl_SI/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/sl_SI/abouttor.properties
+++ b/sl_SI/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/sn/abouttor.properties b/sn/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/sn/abouttor.properties
+++ b/sn/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/so/abouttor.properties b/so/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/so/abouttor.properties
+++ b/so/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/son/abouttor.properties b/son/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/son/abouttor.properties
+++ b/son/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/sq/abouttor.properties b/sq/abouttor.properties
index b8b411e..8ddb8d1 100644
--- a/sq/abouttor.properties
+++ b/sq/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 - Shtesat e Firefox-it pÃ«r shfletim tÃ« sigurt nÃ« web, ndÃ«rkohÃ« qÃ« pÃ«rdorni Tor-in</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'> Shtesat e Firefox-it pÃ«r shfletim tÃ« sigurt nÃ« web, ndÃ«rkohÃ« qÃ« pÃ«rdorni Tor-in</td><td class='sub right'>Projekti Tor</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</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 klasa='txt' lloji='text' pÃ«rmasa='10' emri='q' vlera=''/>
-<input klasa='txt' lloji='text' pÃ«rmasa='10' emri='q' vlera=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'> Shtesat e Firefox-it pÃ«r shfletim tÃ« sigurt nÃ« web, ndÃ«rkohÃ« qÃ« pÃ«rdorni Tor-in</td><td class='sub right'>Projekti Tor</td></tr></table>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>pÃ«rmbledhje</a><a href='/torbutton.git/refs/'>referencÃ«</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>regjistri</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>pemÃ«</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>kryej</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>dif</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  { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-.highlight { sfondi: #ffffff; }
-<span class="c"># Shihni LICENCÃ?N pÃ«r informacionin e licencimit.</span>
-<span class="c"># Shihni LICENCÃ?N pÃ«r informacionin e licencimit.</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"># Shihni LICENCÃ?N pÃ«r informacionin e licencimit.</span>
-<span class="c"># Shihni LICENCÃ?N pÃ«r informacionin e licencimit.</span>
-<span class="c"># Shihni LICENCÃ?N pÃ«r informacionin e licencimit.</span>
-<span class="c"># Shihni LICENCÃ?N pÃ«r informacionin e licencimit.</span>
-<span class="c"># Shihni LICENCÃ?N pÃ«r informacionin e licencimit.</span>
+aboutTor.searchSP.privacy=KÃ«rkoni <a href="%1$S">nÃ« siguri</a> me <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"># Shihni LICENCÃ?N pÃ«r informacionin e licencimit.</span>
-<span class="c"># Shihni LICENCÃ?N pÃ«r informacionin e licencimit.</span>
-<span class="c"># Shihni LICENCÃ?N pÃ«r informacionin e licencimit.</span>
-<span class="c"># Shihni LICENCÃ?N pÃ«r informacionin e licencimit.</span>
-<span class="c"># Shihni LICENCÃ?N pÃ«r informacionin e licencimit.</span>
+aboutTor.searchDDG.privacy=KÃ«rkoni <a href="%1$S">nÃ« siguri</a> me <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"># Shihni LICENCÃ?N pÃ«r informacionin e licencimit.</span>
-<span class="c"># Shihni LICENCÃ?N pÃ«r informacionin e licencimit.</span>
-<span class="c"># Shihni LICENCÃ?N pÃ«r informacionin e licencimit.</span>
-<span class="c"># Shihni LICENCÃ?N pÃ«r informacionin e licencimit.</span>
-<span class="c"># Shihni LICENCÃ?N pÃ«r informacionin e licencimit.</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=KÃ«rkoni <a href="%1$S">nÃ« siguri</a> me <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/sr/abouttor.properties b/sr/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/sr/abouttor.properties
+++ b/sr/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/sr@latin/abouttor.properties b/sr@latin/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/sr@latin/abouttor.properties
+++ b/sr@latin/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/st/abouttor.properties b/st/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/st/abouttor.properties
+++ b/st/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/su/abouttor.properties b/su/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/su/abouttor.properties
+++ b/su/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/sv/abouttor.properties b/sv/abouttor.properties
index 2dc8ac2..fafe44a 100644
--- a/sv/abouttor.properties
+++ b/sv/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=SÃ¶k <a href="%1$S">sÃ¤kert</a> med <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=SÃ¶k <a href="%1$S">sÃ¤kert</a> med <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=SÃ¶k <a href="%1$S">sÃ¤kert</a> med <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/sw/abouttor.properties b/sw/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/sw/abouttor.properties
+++ b/sw/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/szl/abouttor.properties b/szl/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/szl/abouttor.properties
+++ b/szl/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/ta/abouttor.properties b/ta/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ta/abouttor.properties
+++ b/ta/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/te/abouttor.properties b/te/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/te/abouttor.properties
+++ b/te/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/te_IN/abouttor.properties b/te_IN/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/te_IN/abouttor.properties
+++ b/te_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/tg/abouttor.properties b/tg/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/tg/abouttor.properties
+++ b/tg/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/th/abouttor.properties b/th/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/th/abouttor.properties
+++ b/th/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/ti/abouttor.properties b/ti/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ti/abouttor.properties
+++ b/ti/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/tk/abouttor.properties b/tk/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/tk/abouttor.properties
+++ b/tk/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/tl_PH/abouttor.properties b/tl_PH/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/tl_PH/abouttor.properties
+++ b/tl_PH/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/tr/abouttor.properties b/tr/abouttor.properties
index ef3252c..a9c53ab 100644
--- a/tr/abouttor.properties
+++ b/tr/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//TR"
-"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 - Tor kullanarak gÃ¼venli sÃ¶rf iÃ§in Firefox eklentisi.</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'>Tor kullanarak gÃ¼venli sÃ¶rf iÃ§in Firefox eklentisi.</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'>Tor kullanarak gÃ¼venli sÃ¶rf iÃ§in Firefox eklentisi.</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"># Lisans bilgisi iÃ§in LICENSE ' a bakÄ±n</span>
-<span class="c"># Lisans bilgisi iÃ§in LICENSE ' a bakÄ±n</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"># Lisans bilgisi iÃ§in LICENSE ' a bakÄ±n</span>
-<span class="c"># Lisans bilgisi iÃ§in LICENSE ' a bakÄ±n</span>
-<span class="c"># Lisans bilgisi iÃ§in LICENSE ' a bakÄ±n</span>
-<span class="c"># Lisans bilgisi iÃ§in LICENSE ' a bakÄ±n</span>
-<span class="c"># Lisans bilgisi iÃ§in LICENSE ' a bakÄ±n</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/tur/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
 
-<span class="c"># Lisans bilgisi iÃ§in LICENSE ' a bakÄ±n</span>
-<span class="c"># Lisans bilgisi iÃ§in LICENSE ' a bakÄ±n</span>
-<span class="c"># Lisans bilgisi iÃ§in LICENSE ' a bakÄ±n</span>
-<span class="c"># Lisans bilgisi iÃ§in LICENSE ' a bakÄ±n</span>
-<span class="c"># Lisans bilgisi iÃ§in LICENSE ' a bakÄ±n</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"># Lisans bilgisi iÃ§in LICENSE ' a bakÄ±n</span>
-<span class="c"># Lisans bilgisi iÃ§in LICENSE ' a bakÄ±n</span>
-<span class="c"># Lisans bilgisi iÃ§in LICENSE ' a bakÄ±n</span>
-<span class="c"># Lisans bilgisi iÃ§in LICENSE ' a bakÄ±n</span>
-<span class="c"># Lisans bilgisi iÃ§in LICENSE ' a bakÄ±n</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/ug@Arab/abouttor.properties b/ug@Arab/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ug@Arab/abouttor.properties
+++ b/ug@Arab/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/uk/abouttor.properties b/uk/abouttor.properties
index 6fdf373..d607324 100644
--- a/uk/abouttor.properties
+++ b/uk/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 Ð´Ð»Ñ? Ð±ÐµÐ·Ð¿ÐµÑ?Ð½Ð¾Ð³Ð¾ Ð¿ÐµÑ?ÐµÐ³Ð»Ñ?Ð´Ñ? Ð²ÐµÐ±-Ñ?Ñ?Ð¾Ñ?Ñ?Ð½Ð¾Ðº Ð¿Ñ?Ð¸ Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð°Ð½Ð½Ñ? 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 Ð´Ð»Ñ? Ð±ÐµÐ·Ð¿ÐµÑ?Ð½Ð¾Ð³Ð¾ Ð¿ÐµÑ?ÐµÐ³Ð»Ñ?Ð´Ñ? Ð²ÐµÐ±-Ñ?Ñ?Ð¾Ñ?Ñ?Ð½Ð¾Ðº Ð¿Ñ?Ð¸ Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð°Ð½Ð½Ñ? Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/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 Ð´Ð»Ñ? Ð±ÐµÐ·Ð¿ÐµÑ?Ð½Ð¾Ð³Ð¾ Ð¿ÐµÑ?ÐµÐ³Ð»Ñ?Ð´Ñ? Ð²ÐµÐ±-Ñ?Ñ?Ð¾Ñ?Ñ?Ð½Ð¾Ðº Ð¿Ñ?Ð¸ Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð°Ð½Ð½Ñ? Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Ð¿Ñ?Ð´Ñ?Ñ?Ð¼Ð¾Ðº</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Ð»Ð¾Ð³</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Ð´ÐµÑ?ÐµÐ²Ð¾</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/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"># Ð?Ð¸Ð²Ñ?Ñ?Ñ?Ñ?Ñ? Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ñ?Ñ?ÐµÐ½Ð·Ñ?Ð¹Ð½Ñ? Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ?.</span>
-<span class="c"># Ð?Ð¸Ð²Ñ?Ñ?Ñ?Ñ?Ñ? Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ñ?Ñ?ÐµÐ½Ð·Ñ?Ð¹Ð½Ñ? Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ?.</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"># Ð?Ð¸Ð²Ñ?Ñ?Ñ?Ñ?Ñ? Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ñ?Ñ?ÐµÐ½Ð·Ñ?Ð¹Ð½Ñ? Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ?.</span>
-<span class="c"># Ð?Ð¸Ð²Ñ?Ñ?Ñ?Ñ?Ñ? Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ñ?Ñ?ÐµÐ½Ð·Ñ?Ð¹Ð½Ñ? Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ?.</span>
-<span class="c"># Ð?Ð¸Ð²Ñ?Ñ?Ñ?Ñ?Ñ? Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ñ?Ñ?ÐµÐ½Ð·Ñ?Ð¹Ð½Ñ? Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ?.</span>
-<span class="c"># Ð?Ð¸Ð²Ñ?Ñ?Ñ?Ñ?Ñ? Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ñ?Ñ?ÐµÐ½Ð·Ñ?Ð¹Ð½Ñ? Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ?.</span>
-<span class="c"># Ð?Ð¸Ð²Ñ?Ñ?Ñ?Ñ?Ñ? Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ñ?Ñ?ÐµÐ½Ð·Ñ?Ð¹Ð½Ñ? Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ?.</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"># Ð?Ð¸Ð²Ñ?Ñ?Ñ?Ñ?Ñ? Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ñ?Ñ?ÐµÐ½Ð·Ñ?Ð¹Ð½Ñ? Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ?.</span>
-<span class="c"># Ð?Ð¸Ð²Ñ?Ñ?Ñ?Ñ?Ñ? Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ñ?Ñ?ÐµÐ½Ð·Ñ?Ð¹Ð½Ñ? Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ?.</span>
-<span class="c"># Ð?Ð¸Ð²Ñ?Ñ?Ñ?Ñ?Ñ? Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ñ?Ñ?ÐµÐ½Ð·Ñ?Ð¹Ð½Ñ? Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ?.</span>
-<span class="c"># Ð?Ð¸Ð²Ñ?Ñ?Ñ?Ñ?Ñ? Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ñ?Ñ?ÐµÐ½Ð·Ñ?Ð¹Ð½Ñ? Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ?.</span>
-<span class="c"># Ð?Ð¸Ð²Ñ?Ñ?Ñ?Ñ?Ñ? Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ñ?Ñ?ÐµÐ½Ð·Ñ?Ð¹Ð½Ñ? Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ?.</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"># Ð?Ð¸Ð²Ñ?Ñ?Ñ?Ñ?Ñ? Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ñ?Ñ?ÐµÐ½Ð·Ñ?Ð¹Ð½Ñ? Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ?.</span>
-<span class="c"># Ð?Ð¸Ð²Ñ?Ñ?Ñ?Ñ?Ñ? Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ñ?Ñ?ÐµÐ½Ð·Ñ?Ð¹Ð½Ñ? Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ?.</span>
-<span class="c"># Ð?Ð¸Ð²Ñ?Ñ?Ñ?Ñ?Ñ? Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ñ?Ñ?ÐµÐ½Ð·Ñ?Ð¹Ð½Ñ? Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ?.</span>
-<span class="c"># Ð?Ð¸Ð²Ñ?Ñ?Ñ?Ñ?Ñ? Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ñ?Ñ?ÐµÐ½Ð·Ñ?Ð¹Ð½Ñ? Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ?.</span>
-<span class="c"># Ð?Ð¸Ð²Ñ?Ñ?Ñ?Ñ?Ñ? Ð?Ð?Ð¦Ð?Ð?Ð?Ð?Ð® Ð¿Ñ?Ð¾ Ð»Ñ?Ñ?ÐµÐ½Ð·Ñ?Ð¹Ð½Ñ? Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ?.</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/ur/abouttor.properties b/ur/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ur/abouttor.properties
+++ b/ur/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/ur_PK/abouttor.properties b/ur_PK/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ur_PK/abouttor.properties
+++ b/ur_PK/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/uz/abouttor.properties b/uz/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/uz/abouttor.properties
+++ b/uz/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/ve/abouttor.properties b/ve/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ve/abouttor.properties
+++ b/ve/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/vi/abouttor.properties b/vi/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/vi/abouttor.properties
+++ b/vi/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/wa/abouttor.properties b/wa/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/wa/abouttor.properties
+++ b/wa/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/wo/abouttor.properties b/wo/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/wo/abouttor.properties
+++ b/wo/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/yo/abouttor.properties b/yo/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/yo/abouttor.properties
+++ b/yo/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/zh_CN/abouttor.properties b/zh_CN/abouttor.properties
index 913e9d4..e974862 100644
--- a/zh_CN/abouttor.properties
+++ b/zh_CN/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 - ä½¿ç?¨ Tor æ??é?´å®?å?¨æµ?è§?ç½?ç»?ç?? Firefox æ?©å±?</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'>ä½¿ç?¨ Tor æ??é?´å®?å?¨æµ?è§?ç½?ç»?ç?? Firefox æ?©å±?</td><td class='sub right'>Tor é¡¹ç?®</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</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'>ä½¿ç?¨ Tor æ??é?´å®?å?¨æµ?è§?ç½?ç»?ç?? Firefox æ?©å±?</td><td class='sub right'>Tor é¡¹ç?®</td></tr></table>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥å¿?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ ?</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®å¼?</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"># æ?¥ç?? LICENSE äº?è§£è®¸å?¯å??è®®ä¿¡æ?¯ã??</span>
-<span class="c"># æ?¥ç?? LICENSE äº?è§£è®¸å?¯å??è®®ä¿¡æ?¯ã??</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"># æ?¥ç?? LICENSE äº?è§£è®¸å?¯å??è®®ä¿¡æ?¯ã??</span>
-<span class="c"># æ?¥ç?? LICENSE äº?è§£è®¸å?¯å??è®®ä¿¡æ?¯ã??</span>
-<span class="c"># æ?¥ç?? LICENSE äº?è§£è®¸å?¯å??è®®ä¿¡æ?¯ã??</span>
-<span class="c"># æ?¥ç?? LICENSE äº?è§£è®¸å?¯å??è®®ä¿¡æ?¯ã??</span>
-<span class="c"># æ?¥ç?? LICENSE äº?è§£è®¸å?¯å??è®®ä¿¡æ?¯ã??</span>
+aboutTor.searchSP.privacy=ä½¿ç?¨<a href="%2$S">å¼?å§?é¡µ</a><a href="%1$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"># æ?¥ç?? LICENSE äº?è§£è®¸å?¯å??è®®ä¿¡æ?¯ã??</span>
-<span class="c"># æ?¥ç?? LICENSE äº?è§£è®¸å?¯å??è®®ä¿¡æ?¯ã??</span>
-<span class="c"># æ?¥ç?? LICENSE äº?è§£è®¸å?¯å??è®®ä¿¡æ?¯ã??</span>
-<span class="c"># æ?¥ç?? LICENSE äº?è§£è®¸å?¯å??è®®ä¿¡æ?¯ã??</span>
-<span class="c"># æ?¥ç?? LICENSE äº?è§£è®¸å?¯å??è®®ä¿¡æ?¯ã??</span>
+aboutTor.searchDDG.privacy=ä½¿ç?¨<a href="%2$S">DuckDuckGo</a><a href="%1$S">å®?å?¨å?°</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"># æ?¥ç?? LICENSE äº?è§£è®¸å?¯å??è®®ä¿¡æ?¯ã??</span>
-<span class="c"># æ?¥ç?? LICENSE äº?è§£è®¸å?¯å??è®®ä¿¡æ?¯ã??</span>
-<span class="c"># æ?¥ç?? LICENSE äº?è§£è®¸å?¯å??è®®ä¿¡æ?¯ã??</span>
-<span class="c"># æ?¥ç?? LICENSE äº?è§£è®¸å?¯å??è®®ä¿¡æ?¯ã??</span>
-<span class="c"># æ?¥ç?? LICENSE äº?è§£è®¸å?¯å??è®®ä¿¡æ?¯ã??</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="%2$S">Disconnect.me</a><a href="%1$S">å®?å?¨å?°</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/zh_HK/abouttor.properties b/zh_HK/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/zh_HK/abouttor.properties
+++ b/zh_HK/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/zh_TW/abouttor.properties b/zh_TW/abouttor.properties
index 726fc23..d607324 100644
--- a/zh_TW/abouttor.properties
+++ b/zh_TW/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 - ä½¿ç?¨ Tor æ??é??å®?å?¨æµ?è¦½ç¶²è·¯ç?? Firefox æ?´å±?</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'>ä½¿ç?¨ Tor æ??é??å®?å?¨æµ?è¦½ç¶²è·¯ç?? Firefox æ?´å±?</td><td class='sub right'>Tor å°?æ¡?</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</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'>ä½¿ç?¨ Tor æ??é??å®?å?¨æµ?è¦½ç¶²è·¯ç?? Firefox æ?´å±?</td><td class='sub right'>Tor å°?æ¡?</td></tr></table>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>æ??è¦?</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>æ?¥èª?</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>æ¨¹</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>æ??äº¤</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>å·®ç?°</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"># æ?¥ç?? LICENSE ç?è§£æ??æ¬?å??ç´?è³?è¨?ã??</span>
-<span class="c"># æ?¥ç?? LICENSE ç?è§£æ??æ¬?å??ç´?è³?è¨?ã??</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"># æ?¥ç?? LICENSE ç?è§£æ??æ¬?å??ç´?è³?è¨?ã??</span>
-<span class="c"># æ?¥ç?? LICENSE ç?è§£æ??æ¬?å??ç´?è³?è¨?ã??</span>
-<span class="c"># æ?¥ç?? LICENSE ç?è§£æ??æ¬?å??ç´?è³?è¨?ã??</span>
-<span class="c"># æ?¥ç?? LICENSE ç?è§£æ??æ¬?å??ç´?è³?è¨?ã??</span>
-<span class="c"># æ?¥ç?? LICENSE ç?è§£æ??æ¬?å??ç´?è³?è¨?ã??</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"># æ?¥ç?? LICENSE ç?è§£æ??æ¬?å??ç´?è³?è¨?ã??</span>
-<span class="c"># æ?¥ç?? LICENSE ç?è§£æ??æ¬?å??ç´?è³?è¨?ã??</span>
-<span class="c"># æ?¥ç?? LICENSE ç?è§£æ??æ¬?å??ç´?è³?è¨?ã??</span>
-<span class="c"># æ?¥ç?? LICENSE ç?è§£æ??æ¬?å??ç´?è³?è¨?ã??</span>
-<span class="c"># æ?¥ç?? LICENSE ç?è§£æ??æ¬?å??ç´?è³?è¨?ã??</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"># æ?¥ç?? LICENSE ç?è§£æ??æ¬?å??ç´?è³?è¨?ã??</span>
-<span class="c"># æ?¥ç?? LICENSE ç?è§£æ??æ¬?å??ç´?è³?è¨?ã??</span>
-<span class="c"># æ?¥ç?? LICENSE ç?è§£æ??æ¬?å??ç´?è³?è¨?ã??</span>
-<span class="c"># æ?¥ç?? LICENSE ç?è§£æ??æ¬?å??ç´?è³?è¨?ã??</span>
-<span class="c"># æ?¥ç?? LICENSE ç?è§£æ??æ¬?å??ç´?è³?è¨?ã??</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/zu/abouttor.properties b/zu/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/zu/abouttor.properties
+++ b/zu/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/

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

Prev by Author: [tor-commits] [translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed
Next by Author: [tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
Previous by thread: [tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
Next by thread: [tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
Index(es):
- Author
- Thread