[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
translation at torproject.org
translation at torproject.org
Tue Jul 28 19:17:39 UTC 2015
commit 0f0b6a7045813265c8ad44d3a403c4560fd7ca1d
Author: Translation commit bot <translation at torproject.org>
Date: Tue Jul 28 19:17:39 2015 +0000
Update translations for torbutton-abouttorproperties
---
ach/abouttor.properties | 165 +++++---------------------------------
ady/abouttor.properties | 165 +++++---------------------------------
af/abouttor.properties | 165 +++++---------------------------------
ak/abouttor.properties | 165 +++++---------------------------------
am/abouttor.properties | 165 +++++---------------------------------
ar/abouttor.properties | 165 +++++---------------------------------
arn/abouttor.properties | 165 +++++---------------------------------
ast/abouttor.properties | 165 +++++---------------------------------
az/abouttor.properties | 165 +++++---------------------------------
ba/abouttor.properties | 165 +++++---------------------------------
be/abouttor.properties | 165 +++++---------------------------------
bg/abouttor.properties | 165 +++++---------------------------------
bn/abouttor.properties | 165 +++++---------------------------------
bn_IN/abouttor.properties | 165 +++++---------------------------------
bo/abouttor.properties | 165 +++++---------------------------------
br/abouttor.properties | 165 +++++---------------------------------
bs/abouttor.properties | 165 +++++---------------------------------
ca/abouttor.properties | 165 +++++---------------------------------
cs/abouttor.properties | 165 +++++---------------------------------
csb/abouttor.properties | 165 +++++---------------------------------
cv/abouttor.properties | 165 +++++---------------------------------
cy/abouttor.properties | 165 +++++---------------------------------
cy_GB/abouttor.properties | 165 +++++---------------------------------
da/abouttor.properties | 165 +++++---------------------------------
de/abouttor.properties | 165 +++++---------------------------------
dz/abouttor.properties | 165 +++++---------------------------------
el/abouttor.properties | 165 +++++---------------------------------
en/abouttor.properties | 165 +++++---------------------------------
en_GB/abouttor.properties | 165 +++++---------------------------------
eo/abouttor.properties | 165 +++++---------------------------------
es/abouttor.properties | 165 +++++---------------------------------
es_AR/abouttor.properties | 165 +++++---------------------------------
es_CL/abouttor.properties | 165 +++++---------------------------------
es_CO/abouttor.properties | 165 +++++---------------------------------
es_MX/abouttor.properties | 165 +++++---------------------------------
et/abouttor.properties | 165 +++++---------------------------------
eu/abouttor.properties | 165 +++++---------------------------------
fa/abouttor.properties | 166 +++++----------------------------------
fi/abouttor.properties | 165 +++++---------------------------------
fil/abouttor.properties | 165 +++++---------------------------------
fo/abouttor.properties | 165 +++++---------------------------------
fr/abouttor.properties | 166 +++++----------------------------------
fr_CA/abouttor.properties | 165 +++++---------------------------------
fur/abouttor.properties | 165 +++++---------------------------------
fy/abouttor.properties | 165 +++++---------------------------------
ga/abouttor.properties | 165 +++++---------------------------------
gd/abouttor.properties | 165 +++++---------------------------------
gl/abouttor.properties | 165 +++++---------------------------------
gu/abouttor.properties | 165 +++++---------------------------------
gu_IN/abouttor.properties | 165 +++++---------------------------------
gun/abouttor.properties | 165 +++++---------------------------------
ha/abouttor.properties | 165 +++++---------------------------------
he/abouttor.properties | 165 +++++---------------------------------
hi/abouttor.properties | 165 +++++---------------------------------
hr/abouttor.properties | 165 +++++---------------------------------
hr_HR/abouttor.properties | 165 +++++---------------------------------
ht/abouttor.properties | 165 +++++---------------------------------
hu/abouttor.properties | 165 +++++---------------------------------
hy/abouttor.properties | 165 +++++---------------------------------
hy_AM/abouttor.properties | 165 +++++---------------------------------
ia/abouttor.properties | 165 +++++---------------------------------
id/abouttor.properties | 165 +++++---------------------------------
is/abouttor.properties | 165 +++++---------------------------------
it/abouttor.properties | 166 +++++----------------------------------
ja/abouttor.properties | 165 +++++---------------------------------
jbo/abouttor.properties | 165 +++++---------------------------------
jv/abouttor.properties | 165 +++++---------------------------------
ka/abouttor.properties | 165 +++++---------------------------------
kk/abouttor.properties | 165 +++++---------------------------------
km/abouttor.properties | 165 +++++---------------------------------
kn/abouttor.properties | 165 +++++---------------------------------
ko/abouttor.properties | 165 +++++---------------------------------
ko_KR/abouttor.properties | 165 +++++---------------------------------
ku/abouttor.properties | 165 +++++---------------------------------
ku_IQ/abouttor.properties | 165 +++++---------------------------------
kw/abouttor.properties | 165 +++++---------------------------------
ky/abouttor.properties | 165 +++++---------------------------------
la/abouttor.properties | 165 +++++---------------------------------
lb/abouttor.properties | 165 +++++---------------------------------
lg/abouttor.properties | 165 +++++---------------------------------
ln/abouttor.properties | 165 +++++---------------------------------
lo/abouttor.properties | 165 +++++---------------------------------
lt/abouttor.properties | 165 +++++---------------------------------
lv/abouttor.properties | 166 +++++----------------------------------
mg/abouttor.properties | 165 +++++---------------------------------
mi/abouttor.properties | 165 +++++---------------------------------
mk/abouttor.properties | 165 +++++---------------------------------
ml/abouttor.properties | 165 +++++---------------------------------
mn/abouttor.properties | 165 +++++---------------------------------
mr/abouttor.properties | 165 +++++---------------------------------
ms_MY/abouttor.properties | 165 +++++---------------------------------
mt/abouttor.properties | 165 +++++---------------------------------
my/abouttor.properties | 165 +++++---------------------------------
nah/abouttor.properties | 165 +++++---------------------------------
nap/abouttor.properties | 165 +++++---------------------------------
nb/abouttor.properties | 165 +++++---------------------------------
nds/abouttor.properties | 165 +++++---------------------------------
ne/abouttor.properties | 165 +++++---------------------------------
nl/abouttor.properties | 166 +++++----------------------------------
nl_BE/abouttor.properties | 165 +++++---------------------------------
nn/abouttor.properties | 165 +++++---------------------------------
nso/abouttor.properties | 165 +++++---------------------------------
oc/abouttor.properties | 165 +++++---------------------------------
or/abouttor.properties | 165 +++++---------------------------------
pa/abouttor.properties | 165 +++++---------------------------------
pap/abouttor.properties | 165 +++++---------------------------------
pl/abouttor.properties | 165 +++++---------------------------------
pms/abouttor.properties | 165 +++++---------------------------------
ps/abouttor.properties | 165 +++++---------------------------------
pt/abouttor.properties | 165 +++++---------------------------------
pt_BR/abouttor.properties | 166 +++++----------------------------------
ro/abouttor.properties | 166 +++++----------------------------------
ru/abouttor.properties | 165 +++++---------------------------------
ru at petr1708/abouttor.properties | 165 +++++---------------------------------
sa/abouttor.properties | 165 +++++---------------------------------
scn/abouttor.properties | 165 +++++---------------------------------
sco/abouttor.properties | 165 +++++---------------------------------
si/abouttor.properties | 165 +++++---------------------------------
si_LK/abouttor.properties | 165 +++++---------------------------------
sk/abouttor.properties | 165 +++++---------------------------------
sk_SK/abouttor.properties | 165 +++++---------------------------------
sl/abouttor.properties | 165 +++++---------------------------------
sl_SI/abouttor.properties | 165 +++++---------------------------------
sn/abouttor.properties | 165 +++++---------------------------------
so/abouttor.properties | 165 +++++---------------------------------
son/abouttor.properties | 165 +++++---------------------------------
sq/abouttor.properties | 165 +++++---------------------------------
sr/abouttor.properties | 165 +++++---------------------------------
sr at latin/abouttor.properties | 165 +++++---------------------------------
st/abouttor.properties | 165 +++++---------------------------------
su/abouttor.properties | 165 +++++---------------------------------
sv/abouttor.properties | 165 +++++---------------------------------
sw/abouttor.properties | 165 +++++---------------------------------
szl/abouttor.properties | 165 +++++---------------------------------
ta/abouttor.properties | 165 +++++---------------------------------
te/abouttor.properties | 165 +++++---------------------------------
te_IN/abouttor.properties | 165 +++++---------------------------------
tg/abouttor.properties | 165 +++++---------------------------------
th/abouttor.properties | 165 +++++---------------------------------
ti/abouttor.properties | 165 +++++---------------------------------
tk/abouttor.properties | 165 +++++---------------------------------
tl_PH/abouttor.properties | 165 +++++---------------------------------
tr/abouttor.properties | 165 +++++---------------------------------
ug at Arab/abouttor.properties | 165 +++++---------------------------------
uk/abouttor.properties | 166 +++++----------------------------------
ur/abouttor.properties | 165 +++++---------------------------------
ur_PK/abouttor.properties | 165 +++++---------------------------------
uz/abouttor.properties | 165 +++++---------------------------------
ve/abouttor.properties | 165 +++++---------------------------------
vi/abouttor.properties | 165 +++++---------------------------------
wa/abouttor.properties | 165 +++++---------------------------------
wo/abouttor.properties | 165 +++++---------------------------------
yo/abouttor.properties | 165 +++++---------------------------------
zh_CN/abouttor.properties | 165 +++++---------------------------------
zh_HK/abouttor.properties | 165 +++++---------------------------------
zh_TW/abouttor.properties | 166 +++++----------------------------------
zu/abouttor.properties | 165 +++++---------------------------------
157 files changed, 2826 insertions(+), 23088 deletions(-)
diff --git a/ach/abouttor.properties b/ach/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ach/abouttor.properties
+++ b/ach/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/ady/abouttor.properties b/ady/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ady/abouttor.properties
+++ b/ady/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/af/abouttor.properties b/af/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/af/abouttor.properties
+++ b/af/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/ak/abouttor.properties b/ak/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ak/abouttor.properties
+++ b/ak/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/am/abouttor.properties b/am/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/am/abouttor.properties
+++ b/am/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/ar/abouttor.properties b/ar/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ar/abouttor.properties
+++ b/ar/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/arn/abouttor.properties b/arn/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/arn/abouttor.properties
+++ b/arn/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/ast/abouttor.properties b/ast/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ast/abouttor.properties
+++ b/ast/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/az/abouttor.properties b/az/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/az/abouttor.properties
+++ b/az/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/ba/abouttor.properties b/ba/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ba/abouttor.properties
+++ b/ba/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/be/abouttor.properties b/be/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/be/abouttor.properties
+++ b/be/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/bg/abouttor.properties b/bg/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/bg/abouttor.properties
+++ b/bg/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/bn/abouttor.properties b/bn/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/bn/abouttor.properties
+++ b/bn/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/bn_IN/abouttor.properties b/bn_IN/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/bn_IN/abouttor.properties
+++ b/bn_IN/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/bo/abouttor.properties b/bo/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/bo/abouttor.properties
+++ b/bo/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/br/abouttor.properties b/br/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/br/abouttor.properties
+++ b/br/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/bs/abouttor.properties b/bs/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/bs/abouttor.properties
+++ b/bs/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/ca/abouttor.properties b/ca/abouttor.properties
index 2dc8ac2..411e962 100644
--- a/ca/abouttor.properties
+++ b/ca/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Cerca<a href="%1$S">de forma segura</a>amb<a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Cerca <a href="%1$S">de forma segura</a> amb <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Cerca <a href="%1$S">de forma segura</a> amb <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/cs/abouttor.properties b/cs/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/cs/abouttor.properties
+++ b/cs/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/csb/abouttor.properties b/csb/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/csb/abouttor.properties
+++ b/csb/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/cv/abouttor.properties b/cv/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/cv/abouttor.properties
+++ b/cv/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/cy/abouttor.properties b/cy/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/cy/abouttor.properties
+++ b/cy/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/cy_GB/abouttor.properties b/cy_GB/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/cy_GB/abouttor.properties
+++ b/cy_GB/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/da/abouttor.properties b/da/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/da/abouttor.properties
+++ b/da/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/de/abouttor.properties b/de/abouttor.properties
index 6045d3f..b7fc4bf 100644
--- a/de/abouttor.properties
+++ b/de/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//DE"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'>
-<head>
-<title>torbutton Firefox Extension für sicheres Netzsurfen bei der Nutzung von Tor
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox Extension für sicheres Netzsurfen bei der Nutzung von Tor</td><td class='sub right'>Das Tor Projekt</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox Extension für sicheres Netzsurfen bei der Nutzung von Tor</td><td class='sub right'>Das Tor Projekt</td></tr></table>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>Zusammenfassung</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>Protokoll</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>Baum</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
+aboutTor.searchSP.privacy=<a href="%1$S">Sicheres</a> Suchen mit <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/deu/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
+aboutTor.searchDDG.privacy=<a href="%1$S">Sicheres</a> Suchen mit <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-<span class="c"># Siehe LIZENZ für Lizenzierunginformationen.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=<a href="%1$S">Sicheres</a> Suchen mit <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/dz/abouttor.properties b/dz/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/dz/abouttor.properties
+++ b/dz/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/el/abouttor.properties b/el/abouttor.properties
index 2dc8ac2..15e7637 100644
--- a/el/abouttor.properties
+++ b/el/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Ψάξτε <a href="%1$S">αφαλÎÏ‚</a> με <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Ψάξτε <a href="%1$S"> αφαλÎÏ‚</a> με το <a href="%2$S">DuckDuckGo</a>
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy= Ψάξτε <a href="%1$S"> αφαλÎÏ‚</a> με το <a href="%2$S">Disconnect.me</a>
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/en/abouttor.properties b/en/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/en/abouttor.properties
+++ b/en/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/en_GB/abouttor.properties b/en_GB/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/en_GB/abouttor.properties
+++ b/en_GB/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/eo/abouttor.properties b/eo/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/eo/abouttor.properties
+++ b/eo/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/es/abouttor.properties b/es/abouttor.properties
index eaf9a20..fb92251 100644
--- a/es/abouttor.properties
+++ b/es/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Extensión de Firefox para la navegación web segura al usar Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Extensión de Firefox para la navegación web segura al usar Tor</td><td class='sub right'>El proyecto Tor</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Extensión de Firefox para la navegación web segura al usar Tor</td><td class='sub right'>El proyecto Tor</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
+aboutTor.searchSP.privacy=Busque <a href="%1$S">de forma segura</a> con <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/esp/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/esp/
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
+aboutTor.searchDDG.privacy=Busque <a href="%1$S">de forma segura</a> con <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy?kl=-es
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/?kl=-es
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-<span class="c"># Vea la LICENCIA para información sobre licenciamiento.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Busque <a href="%1$S">de forma segura</a> con <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/es_AR/abouttor.properties b/es_AR/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/es_AR/abouttor.properties
+++ b/es_AR/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/es_CL/abouttor.properties b/es_CL/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/es_CL/abouttor.properties
+++ b/es_CL/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/es_CO/abouttor.properties b/es_CO/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/es_CO/abouttor.properties
+++ b/es_CO/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/es_MX/abouttor.properties b/es_MX/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/es_MX/abouttor.properties
+++ b/es_MX/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/et/abouttor.properties b/et/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/et/abouttor.properties
+++ b/et/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/eu/abouttor.properties b/eu/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/eu/abouttor.properties
+++ b/eu/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/fa/abouttor.properties b/fa/abouttor.properties
index 1bd5889..54e04d9 100644
--- a/fa/abouttor.properties
+++ b/fa/abouttor.properties
@@ -1,151 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=جستجو <a href="%1$S">ایمن</a> با <a href="%2$S">صÙØÙ‡ شروع</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=جستجو <a href="%1$S">ایمن</a> با <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=جستجو <a href="%1$S">ایمن</a> با <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/fi/abouttor.properties b/fi/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/fi/abouttor.properties
+++ b/fi/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/fil/abouttor.properties b/fil/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/fil/abouttor.properties
+++ b/fil/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/fo/abouttor.properties b/fo/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/fo/abouttor.properties
+++ b/fo/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/fr/abouttor.properties b/fr/abouttor.properties
index 873a85b..ec59d81 100644
--- a/fr/abouttor.properties
+++ b/fr/abouttor.properties
@@ -1,151 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - extension Firefox pour naviguer de manière sûre pendant l'utilisatoin de Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>l'extension Firefox pour naviguer en sûreté lors de l'utilisation de Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>l'extension Firefox pour naviguer en sûreté lors de l'utilisation de Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
+aboutTor.searchSP.privacy=Rechercher <a href="%1$S">de manière sécurisée</a> avec <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
+aboutTor.searchDDG.privacy=Rechercher <a href="%1$S">de manière sécurisée</a> avec <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-<span class="c"># Voir LICENSE pour les informations de licence.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Rechercher <a href="%1$S">de manière sécurisée</a> avec <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/fr_CA/abouttor.properties b/fr_CA/abouttor.properties
index fc95bed..3bfec1d 100644
--- a/fr_CA/abouttor.properties
+++ b/fr_CA/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//FR"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='fr' lang='fr'>
-<head>
-<title>torbutton - Modules Firefox pour une navigation Web sécuritaire en utilisant Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Modules Firefox pour une navigation Web sécuritaire en utilisant Tor</td><td class='sub right'>Le projet Tor</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Modules Firefox pour une navigation Web sécuritaire en utilisant Tor</td><td class='sub right'>Le projet Tor</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
+aboutTor.searchSP.privacy=Recherchez <a href="%1$S">en toute sécurité</a> avec <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/fra/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/fra/?
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
+aboutTor.searchDDG.privacy=Recherchez <a href="%1$S">en toute sécurité</a> avec <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-<span class="c"># Consultez LICENCE pour des informations de licence.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Recherchez <a href="%1$S">en toute sécurité</a> avec <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/fur/abouttor.properties b/fur/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/fur/abouttor.properties
+++ b/fur/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/fy/abouttor.properties b/fy/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/fy/abouttor.properties
+++ b/fy/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/ga/abouttor.properties b/ga/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ga/abouttor.properties
+++ b/ga/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/gd/abouttor.properties b/gd/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/gd/abouttor.properties
+++ b/gd/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-</pre></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-.highlight { background: #ffffff; }
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-<span class="c"># See LICENSE for licensing information.</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div id='cgit'><table id='header'>
-</div> <!-- class=content -->
-</body>
-</html>
+aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/
diff --git a/gl/abouttor.properties b/gl/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/gl/abouttor.properties
+++ b/gl/abouttor.properties
@@ -1,150 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>torbutton - Firefox extension for safe web browsing while using Tor</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='generator' content='cgit v0.10.2'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-<link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<td class='logo' rowspan='2'><a href='/'><img src='/static/logo.jpg' alt='cgit logo'/></a></td>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<select name='h' onchange='this.form.submit();'>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-<option value='gsoc2009-koryk'>gsoc2009-koryk</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input class='txt' type='text' size='10' name='q' value=''/>
-</form>
-</td></tr></table>
-<div id='cgit'><table id='header'>
-<table class='tabs'><tr><td>
-<tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'>diff</a></td><td class='form'><form class='right' method='get' action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>
-<a href='/torbutton.git/'>summary</a><a href='/torbutton.git/refs/'>refs</a><a href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'>log</a><a class='active' href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'>tree</a><a href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'>commit</a><a href='/torbutton.git/diff/src/chrome/locale/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 at petr1708/abouttor.properties b/ru at petr1708/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ru at petr1708/abouttor.properties
+++ b/ru at 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 at latin/abouttor.properties b/sr at latin/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/sr at latin/abouttor.properties
+++ b/sr at 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 at Arab/abouttor.properties b/ug at Arab/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ug at Arab/abouttor.properties
+++ b/ug at 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/
More information about the tor-commits
mailing list