tor-commits
Threads by month
- ----- 2025 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
July 2015
- 18 participants
- 1250 discussions

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation@torproject.org 28 Jul '15
by translation@torproject.org 28 Jul '15
28 Jul '15
commit c543f46ab2ee6d72376f77b19d83291cccd4a8be
Author: Translation commit bot <translation(a)torproject.org>
Date: Tue Jul 28 19:46:10 2015 +0000
Update translations for torbutton-abouttorproperties
---
es_CO/abouttor.properties | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/es_CO/abouttor.properties b/es_CO/abouttor.properties
index d607324..9861eaa 100644
--- a/es_CO/abouttor.properties
+++ b/es_CO/abouttor.properties
@@ -2,19 +2,19 @@
# See LICENSE for licensing information.
# vim: set sw=2 sts=2 ts=8 et:
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+aboutTor.searchSP.privacy=Buscar <a href="%1$S">securely</a> con<a href="%2$S">Paginainicio</a>.
# The following string is a link which replaces %1$S above.
aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht…
# The following string is a link which replaces %2$S above.
aboutTor.searchSP.search.link=https://startpage.com/
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+aboutTor.searchDDG.privacy=Buscar <a href="%1$S">securely</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/
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
-aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
+aboutTor.searchDC.privacy=Buscar <a href="%1$S">securely</a> con <a href="%2$S">Desconectarme</a>.
# The following string is a link which replaces %1$S above.
aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
# The following string is a link which replaces %2$S above.
1
0

28 Jul '15
commit bf312fb6b97ff32a7545e90b4b3383599b0bbd65
Author: Translation commit bot <translation(a)torproject.org>
Date: Tue Jul 28 19:45:05 2015 +0000
Update translations for gettor
---
es_CO/gettor.po | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/es_CO/gettor.po b/es_CO/gettor.po
index 1705ee2..e7eaa0c 100644
--- a/es_CO/gettor.po
+++ b/es_CO/gettor.po
@@ -4,14 +4,15 @@
#
# Translators:
# Andres Felipe Torres <felipetorresh(a)hotmail.com>, 2015
+# Marcela Garcia-Casteblanco <marcegcol(a)hotmail.com>, 2015
# William Beltrán <wbeltranc(a)gmail.com>, 2015
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-01-19 13:40+0100\n"
-"PO-Revision-Date: 2015-07-18 19:15+0000\n"
-"Last-Translator: Andres Felipe Torres <felipetorresh(a)hotmail.com>\n"
+"PO-Revision-Date: 2015-07-28 19:43+0000\n"
+"Last-Translator: Marcela Garcia-Casteblanco <marcegcol(a)hotmail.com>\n"
"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/torproject/language/es_CO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -32,27 +33,27 @@ msgid ""
"Unfortunately, we won't answer you at this address. You should make\n"
"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
"one of those."
-msgstr "Desafortunadamente, no te responderemos en esta direccion web. Deberas hacer\nuna cuenta con GMAIL.COM, YAHOO.COM o YAHOO.CN y enviar el correo desde\nuno de ellos"
+msgstr "Desafortunadamente, no te responderemos en esta dirección web. Deberás crear\nuna cuenta GMAIL.COM, YAHOO.COM o YAHOO.CN y enviar el correo desde\nuno de ellos"
#: lib/gettor/i18n.py:35
msgid ""
"We only process requests from email services that support \"DKIM\",\n"
"which is an email feature that lets us verify that the address in the\n"
"\"From\" line is actually the one who sent the mail."
-msgstr ""
+msgstr "Solamente procesamos solicitudes de servicios de correo electrónico que soportan \"DKIM\", \nque es una función de correo electrónico que nos permite verificar que la dirección en la\nlínea de \"Remitente\" en realidad es la que envió el correo electrónico."
#: lib/gettor/i18n.py:39
msgid ""
"(We apologize if you didn't ask for this mail. Since your email is from\n"
"a service that doesn't use DKIM, we're sending a short explanation,\n"
"and then we'll ignore this email address for the next day or so.)"
-msgstr ""
+msgstr "(Nos disculpamos si usted no ha solicitado este correo electrónico. Debido a que su correo electrónico proviene de\nun servicio que no usa DKIM, le enviamos una corta explicación\ny luego ésta dirección de correo electrónico será ignorada el siguiente día, mas o menos.)"
#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135
msgid ""
"If you have any questions or it doesn't work, you can contact a\n"
"human at this support email address: help(a)rt.torproject.org"
-msgstr ""
+msgstr "Si tiene alguna pregunta o si no funciona, usted puede contactar a un\nhumano a la dirección de correo electrónico de soporte: help(a)rt.torproject.org"
#: lib/gettor/i18n.py:46
msgid ""
@@ -70,7 +71,7 @@ msgid ""
" obfs-linux-i386\n"
" obfs-linux-x86_64\n"
" source"
-msgstr ""
+msgstr "Le enviaré un paquete Tor si usted me dice cual desea.\nPo favor seleccione uno de los siguientes nombres de paquete:\n\nwindows\nmacos-i386\nmacos-ppc\nlinux-i386\nlinux-x86_64\nobfs-windows\nobfs-macos-i386\nobfs-macos-x86_64\nobfs-linux-i386\nobfs-linux-x86_64\nsource\n "
#: lib/gettor/i18n.py:61
msgid ""
1
0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation@torproject.org 28 Jul '15
by translation@torproject.org 28 Jul '15
28 Jul '15
commit d84095f085a92b484c9dbf121bed31715c4eb27f
Author: Translation commit bot <translation(a)torproject.org>
Date: Tue Jul 28 19:17:57 2015 +0000
Update translations for torbutton-abouttorproperties_completed
---
de/abouttor.properties | 165 +++++---------------------------------------
en/abouttor.properties | 165 +++++---------------------------------------
es/abouttor.properties | 165 +++++---------------------------------------
fr/abouttor.properties | 166 +++++----------------------------------------
fr_CA/abouttor.properties | 165 +++++---------------------------------------
hu/abouttor.properties | 165 +++++---------------------------------------
id/abouttor.properties | 165 +++++---------------------------------------
it/abouttor.properties | 166 +++++----------------------------------------
lv/abouttor.properties | 166 +++++----------------------------------------
nb/abouttor.properties | 165 +++++---------------------------------------
pl/abouttor.properties | 165 +++++---------------------------------------
pt/abouttor.properties | 165 +++++---------------------------------------
pt_BR/abouttor.properties | 166 +++++----------------------------------------
ro/abouttor.properties | 166 +++++----------------------------------------
ru/abouttor.properties | 165 +++++---------------------------------------
sq/abouttor.properties | 165 +++++---------------------------------------
zh_CN/abouttor.properties | 165 +++++---------------------------------------
17 files changed, 306 insertions(+), 2504 deletions(-)
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/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/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/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/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/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/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/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/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/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/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 022a11c..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"># Vezi LICENȚĂ pentru informații referitoare la licenţă.</span>
-<span class="c"># Vezi LICENȚĂ pentru informații referitoare la licenţă.</span>
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
-<span class="c"># Vezi LICENȚĂ pentru informații referitoare la licenţă.</span>
-<span class="c"># Vezi LICENȚĂ pentru informații referitoare la licenţă.</span>
-<span class="c"># Vezi LICENȚĂ pentru informații referitoare la licenţă.</span>
-<span class="c"># Vezi LICENȚĂ pentru informații referitoare la licenţă.</span>
-<span class="c"># Vezi LICENȚĂ pentru informații referitoare la licenţă.</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"># Vezi LICENȚĂ pentru informații referitoare la licenţă.</span>
-<span class="c"># Vezi LICENȚĂ pentru informații referitoare la licenţă.</span>
-<span class="c"># Vezi LICENȚĂ pentru informații referitoare la licenţă.</span>
-<span class="c"># Vezi LICENȚĂ pentru informații referitoare la licenţă.</span>
-<span class="c"># Vezi LICENȚĂ pentru informații referitoare la licenţă.</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"># Vezi LICENȚĂ pentru informații referitoare la licenţă.</span>
-<span class="c"># Vezi LICENȚĂ pentru informații referitoare la licenţă.</span>
-<span class="c"># Vezi LICENȚĂ pentru informații referitoare la licenţă.</span>
-<span class="c"># Vezi LICENȚĂ pentru informații referitoare la licenţă.</span>
-<span class="c"># Vezi LICENȚĂ pentru informații referitoare la licenţă.</span>
-</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/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/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/
1
0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation@torproject.org 28 Jul '15
by translation@torproject.org 28 Jul '15
28 Jul '15
commit 0f0b6a7045813265c8ad44d3a403c4560fd7ca1d
Author: Translation commit bot <translation(a)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(a)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(a)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(a)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(a)petr1708/abouttor.properties b/ru(a)petr1708/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ru(a)petr1708/abouttor.properties
+++ b/ru(a)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(a)latin/abouttor.properties b/sr(a)latin/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/sr(a)latin/abouttor.properties
+++ b/sr(a)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(a)Arab/abouttor.properties b/ug(a)Arab/abouttor.properties
index 2dc8ac2..d607324 100644
--- a/ug(a)Arab/abouttor.properties
+++ b/ug(a)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/
1
0
commit c26e3109e2b3381ef50f3e0d46b66e03c15c90d9
Author: Linus Nordberg <linus(a)nordberg.se>
Date: Thu Mar 12 14:58:44 2015 +0100
Move the IP address note in SOCKSport.
---
doc/tor.1.txt | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index a77cb9b..0ab431e 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -961,6 +961,13 @@ The following options are useful only for clients (that is, if
you. This directive can be specified multiple times to bind
to multiple addresses/ports. (Default: 9050) +
+
+ NOTE: Although this option allows you to specify an IP address
+ other than localhost, you should do so only with extreme caution.
+ The SOCKS protocol is unencrypted and (as we use it)
+ unauthenticated, so exposing it in this way could leak your
+ information to anybody watching your network, and allow anybody
+ to use your computer as an open proxy. +
+ +
The _isolation flags_ arguments give Tor rules for which streams
received on this SOCKSPort are allowed to share circuits with one
another. Recognized isolation flags are:
@@ -1001,14 +1008,6 @@ The following options are useful only for clients (that is, if
**PreferIPv6**;;
Tells exits that, if a host has both an IPv4 and an IPv6 address,
we would prefer to connect to it via IPv6. (IPv4 is the default.) +
- +
- NOTE: Although this option allows you to specify an IP address
- other than localhost, you should do so only with extreme caution.
- The SOCKS protocol is unencrypted and (as we use it)
- unauthenticated, so exposing it in this way could leak your
- information to anybody watching your network, and allow anybody
- to use your computer as an open proxy. +
- +
**CacheIPv4DNS**;;
Tells the client to remember IPv4 DNS answers we receive from exit
nodes via this connection. (On by default.)
1
0

28 Jul '15
commit 0dab1bc8127a9bfa860bec24490ab54401b96afb
Merge: cedc651 c26e310
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Tue Jul 28 14:38:52 2015 -0400
Merge remote-tracking branch 'linus/bug_11061'
1
0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk@torproject.org 28 Jul '15
by gk@torproject.org 28 Jul '15
28 Jul '15
commit 05e826cfabe18b243c833774a867a895e6dec5cb
Author: Arthur Edelstein <arthuredelstein(a)gmail.com>
Date: Thu Jul 16 16:32:47 2015 -0700
fixup! TB4: Tor Browser's Firefox preference overrides.
---
browser/app/profile/000-tor-browser.js | 199 ++++++++++++++++++++++++++++++++
1 file changed, 199 insertions(+)
diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index 8188855..95bc04b 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -237,3 +237,202 @@ pref("security.cert_pinning.enforcement_level", 2);
#ifdef TOR_BROWSER_VERSION
#expand pref("torbrowser.version", __TOR_BROWSER_VERSION__);
#endif
+
+// If we are bundling fonts, only allow bundled fonts to be used.
+#ifdef MOZ_BUNDLED_FONTS
+pref("font.default.lo", "Noto Sans Lao");
+pref("font.default.my", "Noto Sans Myanmar");
+pref("font.default.x-western", "sans-serif");
+pref("font.internaluseonly.changed", true);
+pref("font.name-list.cursive.ar", "Noto Naskh Arabic");
+pref("font.name-list.cursive.el", "Noto Serif");
+pref("font.name-list.cursive.he", "Noto Sans Hebrew");
+pref("font.name-list.cursive.x-cyrillic", "Noto Serif");
+pref("font.name-list.cursive.x-unicode", "Noto Serif, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Lao\, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Sans Yi, Noto Serif Lao");
+pref("font.name-list.cursive.x-western", "Noto Serif");
+pref("font.name-list.fantasy.ar", "Noto Kufi Arabic");
+pref("font.name-list.fantasy.el", "Noto Serif");
+pref("font.name-list.fantasy.he", "Noto Sans Hebrew");
+pref("font.name-list.fantasy.x-cyrillic", "Noto Serif");
+pref("font.name-list.fantasy.x-unicode", "Noto Serif, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Lao\, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Sans Yi, Noto Serif Lao");
+pref("font.name-list.fantasy.x-western", "Noto Serif");
+pref("font.name-list.monospace.ar", "Noto Kufi Arabic");
+pref("font.name-list.monospace.el", "Cousine");
+pref("font.name-list.monospace.he", "Noto Sans Hebrew");
+pref("font.name-list.monospace.ja", "Noto Sans CJK SC Regular");
+pref("font.name-list.monospace.ko", "Noto Sans CJK SC Regular");
+pref("font.name-list.monospace.th", "Noto Sans Thai");
+pref("font.name-list.monospace.x-armn", "Noto Sans Armenian");
+pref("font.name-list.monospace.x-beng", "Noto Sans Bengali");
+pref("font.name-list.monospace.x-cyrillic", "Cousine");
+pref("font.name-list.monospace.x-devanagari", "Noto Sans Devanagari");
+pref("font.name-list.monospace.x-ethi", "Noto Sans Ethiopic");
+pref("font.name-list.monospace.x-geor", "Noto Sans Georgian");
+pref("font.name-list.monospace.x-gujr", "Noto Sans Gujarati");
+pref("font.name-list.monospace.x-guru", "Noto Sans Gurmukhi");
+pref("font.name-list.monospace.x-khmr", "Noto Sans Khmer");
+pref("font.name-list.monospace.x-knda", "Noto Sans Kannada");
+pref("font.name-list.monospace.x-mlym", "Noto Sans Malayalam");
+pref("font.name-list.monospace.x-orya", "Noto Sans Oriya");
+pref("font.name-list.monospace.x-sinh", "Noto Sans Sinhala");
+pref("font.name-list.monospace.x-tamil", "Noto Sans Tamil");
+pref("font.name-list.monospace.x-telu", "Noto Sans Telugu");
+pref("font.name-list.monospace.x-tibt", "Noto Sans Tibetan");
+pref("font.name-list.monospace.x-unicode", "Cousine, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Serif Lao");
+pref("font.name-list.monospace.x-western", "Cousine");
+pref("font.name-list.monospace.zh-CN", "Noto Sans CJK SC Regular");
+pref("font.name-list.monospace.zh-HK", "Noto Sans CJK SC Regular");
+pref("font.name-list.monospace.zh-TW", "Noto Sans CJK SC Regular");
+pref("font.name-list.sans-serif.ar", "Noto Naskh Arabic");
+pref("font.name-list.sans-serif.el", "Noto Sans");
+pref("font.name-list.sans-serif.he", "Noto Sans Hebrew");
+pref("font.name-list.sans-serif.ja", "Noto Sans CJK SC Regular");
+pref("font.name-list.sans-serif.ko", "Noto Sans CJK SC Regular");
+pref("font.name-list.sans-serif.th", "Noto Sans Thai");
+pref("font.name-list.sans-serif.x-armn", "Noto Sans Armenian");
+pref("font.name-list.sans-serif.x-beng", "Noto Sans Bengali");
+pref("font.name-list.sans-serif.x-cyrillic", "Noto Sans");
+pref("font.name-list.sans-serif.x-devanagari", "Noto Sans Devanagari");
+pref("font.name-list.sans-serif.x-ethi", "Noto Sans Ethiopic");
+pref("font.name-list.sans-serif.x-geor", "Noto Sans Georgian");
+pref("font.name-list.sans-serif.x-gujr", "Noto Sans Gujarati");
+pref("font.name-list.sans-serif.x-guru", "Noto Sans Gurmukhi");
+pref("font.name-list.sans-serif.x-khmr", "Noto Sans Khmer");
+pref("font.name-list.sans-serif.x-knda", "Noto Sans Kannada");
+pref("font.name-list.sans-serif.x-mlym", "Noto Sans Malayalam");
+pref("font.name-list.sans-serif.x-orya", "Noto Sans Oriya");
+pref("font.name-list.sans-serif.x-sinh", "Noto Sans Sinhala");
+pref("font.name-list.sans-serif.x-tamil", "Noto Sans Tamil");
+pref("font.name-list.sans-serif.x-telu", "Noto Sans Telugu");
+pref("font.name-list.sans-serif.x-tibt", "Noto Sans Tibetan");
+pref("font.name-list.sans-serif.x-unicode", "Noto Sans, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Serif Lao");
+pref("font.name-list.sans-serif.x-western", "Noto Sans");
+pref("font.name-list.sans-serif.zh-CN", "Noto Sans CJK SC Regular");
+pref("font.name-list.sans-serif.zh-HK", "Noto Sans CJK SC Regular");
+pref("font.name-list.sans-serif.zh-TW", "Noto Sans CJK SC Regular");
+pref("font.name-list.serif.ar", "Noto Naskh Arabic");
+pref("font.name-list.serif.el", "Noto Serif");
+pref("font.name-list.serif.he", "Noto Sans Hebrew");
+pref("font.name-list.serif.ja", "Noto Sans CJK SC Regular");
+pref("font.name-list.serif.ko", "Noto Sans CJK SC Regular");
+pref("font.name-list.serif.th", "Noto Sans Thai");
+pref("font.name-list.serif.th", "Noto Serif Thai");
+pref("font.name-list.serif.x-armn", "Noto Serif Armenian");
+pref("font.name-list.serif.x-beng", "Noto Sans Bengali");
+pref("font.name-list.serif.x-cyrillic", "Noto Serif");
+pref("font.name-list.serif.x-devanagari", "Noto Sans Devanagari");
+pref("font.name-list.serif.x-ethi", "Noto Sans Ethiopic");
+pref("font.name-list.serif.x-geor", "Noto Sans Georgian");
+pref("font.name-list.serif.x-gujr", "Noto Sans Gujarati");
+pref("font.name-list.serif.x-guru", "Noto Sans Gurmukhi");
+pref("font.name-list.serif.x-khmr", "Noto Serif Khmer");
+pref("font.name-list.serif.x-knda", "Noto Sans Kannada");
+pref("font.name-list.serif.x-mlym", "Noto Sans Malayalam");
+pref("font.name-list.serif.x-orya", "Noto Sans Oriya");
+pref("font.name-list.serif.x-sinh", "Noto Sans Sinhala");
+pref("font.name-list.serif.x-tamil", "Noto Sans Tamil");
+pref("font.name-list.serif.x-telu", "Noto Sans Telugu");
+pref("font.name-list.serif.x-tibt", "Noto Sans Tibetan");
+pref("font.name-list.serif.x-unicode", "Noto Serif, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Sans Yi, Noto Serif Lao");
+pref("font.name-list.serif.x-western", "Noto Serif");
+pref("font.name-list.serif.zh-CN", "Noto Sans CJK SC Regular");
+pref("font.name-list.serif.zh-HK", "Noto Sans CJK SC Regular");
+pref("font.name-list.serif.zh-TW", "Noto Sans CJK SC Regular");
+pref("font.name.cursive.ar", "Noto Naskh Arabic");
+pref("font.name.cursive.el", "Noto Serif");
+pref("font.name.cursive.he", "Noto Sans Hebrew");
+pref("font.name.cursive.x-cyrillic", "Noto Serif");
+pref("font.name.cursive.x-unicode", "Noto Serif");
+pref("font.name.cursive.x-western", "Noto Serif");
+pref("font.name.fantasy.ar", "Noto Kufi Arabic");
+pref("font.name.fantasy.el", "Noto Serif");
+pref("font.name.fantasy.he", "Noto Sans Hebrew");
+pref("font.name.fantasy.x-cyrillic", "Noto Serif");
+pref("font.name.fantasy.x-unicode", "Noto Serif");
+pref("font.name.fantasy.x-western", "Noto Serif");
+pref("font.name.monospace.ar", "Noto Kufi Arabic");
+pref("font.name.monospace.el", "Cousine");
+pref("font.name.monospace.he", "Noto Sans Hebrew");
+pref("font.name.monospace.ja", "Noto Sans CJK SC Regular");
+pref("font.name.monospace.ko", "Noto Sans CJK SC Regular");
+pref("font.name.monospace.my", "Noto Sans Myanmar");
+pref("font.name.monospace.th", "Noto Sans Thai");
+pref("font.name.monospace.x-armn", "Noto Sans Armenian");
+pref("font.name.monospace.x-beng", "Noto Sans Bengali");
+pref("font.name.monospace.x-cyrillic", "Cousine");
+pref("font.name.monospace.x-devanagari", "Noto Sans Devanagari");
+pref("font.name.monospace.x-ethi", "Noto Sans Ethiopic");
+pref("font.name.monospace.x-geor", "Noto Sans Georgian");
+pref("font.name.monospace.x-gujr", "Noto Sans Gujarati");
+pref("font.name.monospace.x-guru", "Noto Sans Gurmukhi");
+pref("font.name.monospace.x-khmr", "Noto Sans Khmer");
+pref("font.name.monospace.x-knda", "Noto Sans Kannada");
+pref("font.name.monospace.x-mlym", "Noto Sans Malayalam");
+pref("font.name.monospace.x-orya", "Noto Sans Oriya");
+pref("font.name.monospace.x-sinh", "Noto Sans Sinhala");
+pref("font.name.monospace.x-tamil", "Noto Sans Tamil");
+pref("font.name.monospace.x-telu", "Noto Sans Telugu");
+pref("font.name.monospace.x-tibt", "Noto Sans Tibetan");
+pref("font.name.monospace.x-unicode", "Cousine");
+pref("font.name.monospace.x-western", "Cousine");
+pref("font.name.monospace.zh-CN", "Noto Sans CJK SC Regular");
+pref("font.name.monospace.zh-HK", "Noto Sans CJK SC Regular");
+pref("font.name.monospace.zh-TW", "Noto Sans CJK SC Regular");
+pref("font.name.sans-serif.ar", "Noto Naskh Arabic");
+pref("font.name.sans-serif.el", "Noto Sans");
+pref("font.name.sans-serif.he", "Noto Sans Hebrew");
+pref("font.name.sans-serif.ja", "Noto Sans CJK SC Regular");
+pref("font.name.sans-serif.ko", "Noto Sans CJK SC Regular");
+pref("font.name.sans-serif.th", "Noto Sans Thai");
+pref("font.name.sans-serif.x-armn", "Noto Sans Armenian");
+pref("font.name.sans-serif.x-beng", "Noto Sans Bengali");
+pref("font.name.sans-serif.x-cyrillic", "Noto Sans");
+pref("font.name.sans-serif.x-devanagari", "Noto Sans Devanagari");
+pref("font.name.sans-serif.x-ethi", "Noto Sans Ethiopic");
+pref("font.name.sans-serif.x-geor", "Noto Sans Georgian");
+pref("font.name.sans-serif.x-gujr", "Noto Sans Gujarati");
+pref("font.name.sans-serif.x-guru", "Noto Sans Gurmukhi");
+pref("font.name.sans-serif.x-khmr", "Noto Sans Khmer");
+pref("font.name.sans-serif.x-knda", "Noto Sans Kannada");
+pref("font.name.sans-serif.x-mlym", "Noto Sans Malayalam");
+pref("font.name.sans-serif.x-orya", "Noto Sans Oriya");
+pref("font.name.sans-serif.x-sinh", "Noto Sans Sinhala");
+pref("font.name.sans-serif.x-tamil", "Noto Sans Tamil");
+pref("font.name.sans-serif.x-telu", "Noto Sans Telugu");
+pref("font.name.sans-serif.x-tibt", "Noto Sans Tibetan");
+pref("font.name.sans-serif.x-unicode", "Noto Sans");
+pref("font.name.sans-serif.x-western", "Noto Sans");
+pref("font.name.sans-serif.zh-CN", "Noto Sans CJK SC Regular");
+pref("font.name.sans-serif.zh-HK", "Noto Sans CJK SC Regular");
+pref("font.name.sans-serif.zh-TW", "Noto Sans CJK SC Regular");
+pref("font.name.sans.my", "Noto Sans Myanmar");
+pref("font.name.serif.ar", "Noto Naskh Arabic");
+pref("font.name.serif.el", "Noto Serif");
+pref("font.name.serif.he", "Noto Sans Hebrew");
+pref("font.name.serif.ja", "Noto Sans CJK SC Regular");
+pref("font.name.serif.ko", "Noto Sans CJK SC Regular");
+pref("font.name.serif.my", "Noto Sans Myanmar");
+pref("font.name.serif.th", "Noto Serif Thai");
+pref("font.name.serif.x-armn", "Noto Serif Armenian");
+pref("font.name.serif.x-beng", "Noto Sans Bengali");
+pref("font.name.serif.x-cyrillic", "Noto Serif");
+pref("font.name.serif.x-devanagari", "Noto Sans Devanagari");
+pref("font.name.serif.x-ethi", "Noto Sans Ethiopic");
+pref("font.name.serif.x-geor", "Noto Sans Georgian");
+pref("font.name.serif.x-gujr", "Noto Sans Gujarati");
+pref("font.name.serif.x-guru", "Noto Sans Gurmukhi");
+pref("font.name.serif.x-khmr", "Noto Serif Khmer");
+pref("font.name.serif.x-knda", "Noto Sans Kannada");
+pref("font.name.serif.x-mlym", "Noto Sans Malayalam");
+pref("font.name.serif.x-orya", "Noto Sans Oriya");
+pref("font.name.serif.x-sinh", "Noto Sans Sinhala");
+pref("font.name.serif.x-tamil", "Noto Sans Tamil");
+pref("font.name.serif.x-telu", "Noto Sans Telugu");
+pref("font.name.serif.x-tibt", "Noto Sans Tibetan");
+pref("font.name.serif.x-unicode", "Noto Serif");
+pref("font.name.serif.x-western", "Noto Serif");
+pref("font.name.serif.zh-CN", "Noto Sans CJK SC Regular");
+pref("font.name.serif.zh-HK", "Noto Sans CJK SC Regular");
+pref("font.name.serif.zh-TW", "Noto Sans CJK SC Regular");
+pref("font.system.whitelist", "Cousine, Noto Kufi Arabic, Noto Naskh Arabic, Noto Sans, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai");
+#endif
1
0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Bug #13313 Part 2: Fix windows cross-compile for --enable-bundled-fonts
by gk@torproject.org 28 Jul '15
by gk@torproject.org 28 Jul '15
28 Jul '15
commit be6a317e6a7f028a882f6f641b7f90960e8fd239
Author: Arthur Edelstein <arthuredelstein(a)gmail.com>
Date: Mon Jul 20 08:52:24 2015 -0700
Bug #13313 Part 2: Fix windows cross-compile for --enable-bundled-fonts
---
gfx/thebes/gfxDWriteFontList.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/gfx/thebes/gfxDWriteFontList.cpp b/gfx/thebes/gfxDWriteFontList.cpp
index 8d0ae81..5eb2488 100644
--- a/gfx/thebes/gfxDWriteFontList.cpp
+++ b/gfx/thebes/gfxDWriteFontList.cpp
@@ -1803,6 +1803,7 @@ private:
BundledFontFileEnumerator() = delete;
BundledFontFileEnumerator(const BundledFontFileEnumerator&) = delete;
BundledFontFileEnumerator& operator=(const BundledFontFileEnumerator&) = delete;
+ virtual ~BundledFontFileEnumerator() {}
nsRefPtr<IDWriteFactory> mFactory;
@@ -1870,6 +1871,7 @@ public:
private:
BundledFontLoader(const BundledFontLoader&) = delete;
BundledFontLoader& operator=(const BundledFontLoader&) = delete;
+ virtual ~BundledFontLoader() { }
};
IFACEMETHODIMP
1
0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Bug #13313: Pref 'font.system.whitelist' restricts set of permitted fonts
by gk@torproject.org 28 Jul '15
by gk@torproject.org 28 Jul '15
28 Jul '15
commit 2a36205b70076fc26145400addaa383142d71c81
Author: Arthur Edelstein <arthuredelstein(a)gmail.com>
Date: Thu Jul 23 09:44:20 2015 -0700
Bug #13313: Pref 'font.system.whitelist' restricts set of permitted fonts
---
gfx/thebes/gfxDWriteFontList.cpp | 4 ++++
gfx/thebes/gfxFT2FontList.cpp | 28 +++++++++++++++-------------
gfx/thebes/gfxFontUtils.cpp | 25 +++++++++++++++++++++++++
gfx/thebes/gfxFontUtils.h | 11 +++++++++++
gfx/thebes/gfxFontconfigUtils.cpp | 31 +++++++++++++++++++++++++++++++
gfx/thebes/gfxFontconfigUtils.h | 3 +++
gfx/thebes/gfxGDIFontList.cpp | 2 +-
gfx/thebes/gfxMacPlatformFontList.mm | 7 +++++++
8 files changed, 97 insertions(+), 14 deletions(-)
diff --git a/gfx/thebes/gfxDWriteFontList.cpp b/gfx/thebes/gfxDWriteFontList.cpp
index 5eb2488..2e28fbf 100644
--- a/gfx/thebes/gfxDWriteFontList.cpp
+++ b/gfx/thebes/gfxDWriteFontList.cpp
@@ -1146,6 +1146,10 @@ gfxDWriteFontList::GetFontsFromCollection(IDWriteFontCollection* aCollection)
nsDependentString familyName(enName.Elements());
+ if (!gfxFontUtils::IsFontFamilyNameAllowed(familyName)) {
+ continue;
+ }
+
fam = new gfxDWriteFontFamily(familyName, family);
if (!fam) {
continue;
diff --git a/gfx/thebes/gfxFT2FontList.cpp b/gfx/thebes/gfxFT2FontList.cpp
index 671813b..da72559 100644
--- a/gfx/thebes/gfxFT2FontList.cpp
+++ b/gfx/thebes/gfxFT2FontList.cpp
@@ -1044,7 +1044,7 @@ gfxFT2FontList::AddFaceToList(const nsCString& aEntryName, uint32_t aIndex,
NS_ConvertUTF8toUTF16 name(aFace->family_name);
BuildKeyNameFromFontName(name);
gfxFontFamily *family = fontFamilies.GetWeak(name);
- if (!family) {
+ if (!family && gfxFontUtils::IsFontFamilyNameAllowed(name)) {
family = new FT2FontFamily(name);
fontFamilies.Put(name, family);
if (mSkipSpaceLookupCheckFamilies.Contains(name)) {
@@ -1315,20 +1315,22 @@ gfxFT2FontList::AppendFaceFromFontListEntry(const FontListEntry& aFLE,
aFLE.isHidden() ? mHiddenFontFamilies : mFontFamilies;
fe->mStandardFace = (aStdFile == kStandard);
nsAutoString name(aFLE.familyName());
- gfxFontFamily *family = fontFamilies.GetWeak(name);
- if (!family) {
- family = new FT2FontFamily(name);
- fontFamilies.Put(name, family);
- if (mSkipSpaceLookupCheckFamilies.Contains(name)) {
- family->SetSkipSpaceFeatureCheck(true);
- }
- if (mBadUnderlineFamilyNames.Contains(name)) {
- family->SetBadUnderlineFamily();
+ if (gfxFontUtils::IsFontFamilyNameAllowed(name)) {
+ gfxFontFamily *family = fontFamilies.GetWeak(name);
+ if (!family) {
+ family = new FT2FontFamily(name);
+ fontFamilies.Put(name, family);
+ if (mSkipSpaceLookupCheckFamilies.Contains(name)) {
+ family->SetSkipSpaceFeatureCheck(true);
+ }
+ if (mBadUnderlineFamilyNames.Contains(name)) {
+ family->SetBadUnderlineFamily();
+ }
}
- }
- family->AddFontEntry(fe);
+ family->AddFontEntry(fe);
- fe->CheckForBrokenFont(family);
+ fe->CheckForBrokenFont(family);
+ }
}
}
diff --git a/gfx/thebes/gfxFontUtils.cpp b/gfx/thebes/gfxFontUtils.cpp
index 094f74a..5432c7a 100644
--- a/gfx/thebes/gfxFontUtils.cpp
+++ b/gfx/thebes/gfxFontUtils.cpp
@@ -1771,3 +1771,28 @@ gfxFontUtils::IsCffFont(const uint8_t* aFontData)
#endif
+/* static */
+nsTHashtable<nsStringHashKey>* gfxFontUtils::sWhitelistFamilyNames = nullptr;
+
+/* static */
+bool
+gfxFontUtils::IsFontFamilyNameAllowed(const nsAString& aFontFamilyName)
+{
+ if (!sWhitelistFamilyNames) {
+ sWhitelistFamilyNames = new nsTHashtable<nsStringHashKey>();
+ nsAutoTArray<nsString, 10> list;
+ GetPrefsFontList("font.system.whitelist", list);
+ uint32_t numFonts = list.Length();
+ for (uint32_t i = 0; i < numFonts; i++) {
+ nsAutoString key;
+ ToLowerCase(list[i], key);
+ sWhitelistFamilyNames->PutEntry(key);
+ }
+ }
+ nsAutoString fontFamilyNameLower;
+ ToLowerCase(aFontFamilyName, fontFamilyNameLower);
+ // If whitelist is empty, any family name is allowed. If whitelist
+ // has entries, then only allow family names in the whitelist.
+ return sWhitelistFamilyNames->Count() == 0 ||
+ sWhitelistFamilyNames->Contains(fontFamilyNameLower);
+}
diff --git a/gfx/thebes/gfxFontUtils.h b/gfx/thebes/gfxFontUtils.h
index 2da48af..18eaa2d 100644
--- a/gfx/thebes/gfxFontUtils.h
+++ b/gfx/thebes/gfxFontUtils.h
@@ -1,3 +1,4 @@
+
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,6 +10,8 @@
#include "gfxPlatform.h"
#include "nsComponentManagerUtils.h"
#include "nsTArray.h"
+#include "nsTHashtable.h"
+#include "nsHashKeys.h"
#include "nsAutoPtr.h"
#include "mozilla/Likely.h"
#include "mozilla/Endian.h"
@@ -971,6 +974,14 @@ public:
nsTArray<uint16_t> &aGlyphs,
nsTArray<mozilla::gfx::Color> &aColors);
+ // A list of white-listed system fonts. If the list is empty, we permit
+ // all fonts.
+ static nsTHashtable<nsStringHashKey>* sWhitelistFamilyNames;
+
+ // Returns true only if the font family name is whitelisted or the
+ // whitelist is empty.
+ static bool IsFontFamilyNameAllowed(const nsAString& aFontFamilyName);
+
protected:
friend struct MacCharsetMappingComparator;
diff --git a/gfx/thebes/gfxFontconfigUtils.cpp b/gfx/thebes/gfxFontconfigUtils.cpp
index f5d3e9c..829a52e 100644
--- a/gfx/thebes/gfxFontconfigUtils.cpp
+++ b/gfx/thebes/gfxFontconfigUtils.cpp
@@ -587,6 +587,9 @@ gfxFontconfigUtils::UpdateFontListInternal(bool aForce)
ActivateBundledFonts();
#endif
+ ApplyWhitelist();
+ currentConfig = FcConfigGetCurrent();
+
// These FcFontSets are owned by fontconfig
FcFontSet *fontSets[] = {
FcConfigGetFonts(currentConfig, FcSetSystem)
@@ -1087,4 +1090,32 @@ gfxFontconfigUtils::ActivateBundledFonts()
}
}
+void
+gfxFontconfigUtils::ApplyWhitelist()
+{
+ // Get the font family names in the font file loaded in the old configuration.
+ // If any of the font families are in our whitelist, then add that
+ // file to the new configuration. Otherwise, leave it out.
+ FcPattern *pattern = FcPatternCreate();
+ FcObjectSet *objectSet = FcObjectSetBuild(FC_FILE, FC_FAMILY, nullptr);
+ FcFontSet *fontSet = FcFontList(nullptr, pattern, objectSet);
+ FcConfig *newConfig = FcConfigCreate();
+ for (int i = 0; i < fontSet->nfont; ++i) {
+ FcPattern *font = fontSet->fonts[i];
+ FcChar8 *file, *family;
+ FcPatternGetString(font, FC_FILE, 0, &file);
+ for (int j = 0;
+ FcPatternGetString(font,
+ FC_FAMILY, j, &family) == FcResultMatch;
+ ++j) {
+ nsAutoCString strFamily((char *) family);
+ if (gfxFontUtils::IsFontFamilyNameAllowed(NS_ConvertUTF8toUTF16(strFamily))) {
+ FcConfigAppFontAddFile(newConfig, file);
+ break;
+ }
+ }
+ }
+ FcConfigSetCurrent(newConfig);
+}
+
#endif
diff --git a/gfx/thebes/gfxFontconfigUtils.h b/gfx/thebes/gfxFontconfigUtils.h
index de9f27f..7bd0cfc 100644
--- a/gfx/thebes/gfxFontconfigUtils.h
+++ b/gfx/thebes/gfxFontconfigUtils.h
@@ -310,6 +310,9 @@ protected:
nsCString mBundledFontsPath;
bool mBundledFontsInitialized;
#endif
+
+private:
+ void ApplyWhitelist();
};
#endif /* GFX_FONTCONFIG_UTILS_H */
diff --git a/gfx/thebes/gfxGDIFontList.cpp b/gfx/thebes/gfxGDIFontList.cpp
index cce880b..7a0ba3f 100644
--- a/gfx/thebes/gfxGDIFontList.cpp
+++ b/gfx/thebes/gfxGDIFontList.cpp
@@ -697,7 +697,7 @@ gfxGDIFontList::EnumFontFamExProc(ENUMLOGFONTEXW *lpelfe,
gfxGDIFontList *fontList = PlatformFontList();
- if (!fontList->mFontFamilies.GetWeak(name)) {
+ if (gfxFontUtils::IsFontFamilyNameAllowed(name) && !fontList->mFontFamilies.GetWeak(name)) {
nsDependentString faceName(lf.lfFaceName);
nsRefPtr<gfxFontFamily> family = new GDIFontFamily(faceName);
fontList->mFontFamilies.Put(name, family);
diff --git a/gfx/thebes/gfxMacPlatformFontList.mm b/gfx/thebes/gfxMacPlatformFontList.mm
index df859e5..02f5137 100644
--- a/gfx/thebes/gfxMacPlatformFontList.mm
+++ b/gfx/thebes/gfxMacPlatformFontList.mm
@@ -682,6 +682,10 @@ gfxMacPlatformFontList::InitFontList()
buffer[len] = 0;
nsAutoString familyName(reinterpret_cast<char16_t*>(buffer.Elements()), len);
+ if (!gfxFontUtils::IsFontFamilyNameAllowed(familyName)) {
+ continue;
+ }
+
// create a family entry
gfxFontFamily *familyEntry = new gfxMacFontFamily(familyName);
if (!familyEntry) break;
@@ -726,6 +730,9 @@ gfxMacPlatformFontList::InitSingleFaceList()
LOG_FONTLIST(("(fontlist-singleface) face name: %s\n",
NS_ConvertUTF16toUTF8(singleFaceFonts[i]).get()));
#endif
+ if (!gfxFontUtils::IsFontFamilyNameAllowed(singleFaceFonts[i])) {
+ continue;
+ }
gfxFontEntry *fontEntry = LookupLocalFont(singleFaceFonts[i],
400, 0,
NS_FONT_STYLE_NORMAL);
1
0

[tor-browser-bundle/master] Add --enable-bundled-fonts to firefox config.
by gk@torproject.org 28 Jul '15
by gk@torproject.org 28 Jul '15
28 Jul '15
commit b2f9648ada10c5f9eb0dd093928bfd4919d76f51
Author: David Fifield <david(a)bamsoftware.com>
Date: Wed Dec 31 20:21:51 2014 +0000
Add --enable-bundled-fonts to firefox config.
---
gitian/descriptors/linux/gitian-firefox.yml | 2 +-
gitian/descriptors/mac/gitian-firefox.yml | 2 +-
gitian/descriptors/windows/gitian-firefox.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml
index 05b2beb..1efed90 100644
--- a/gitian/descriptors/linux/gitian-firefox.yml
+++ b/gitian/descriptors/linux/gitian-firefox.yml
@@ -110,7 +110,7 @@ script: |
# that feature it would hang sometimes for unknown but to libfaketime related
# reasons.
export LD_PRELOAD=""
- make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}"
+ make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts"
# We need libfaketime for all the timestamps e.g. written into the libraries.
# BUT we need to exclude |make build| from it. Otherwise the build fails close
# to the end, see #12461 comment 8 and later. Additionally, we need to avoid
diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml
index e8f1046..8b85b5a 100644
--- a/gitian/descriptors/mac/gitian-firefox.yml
+++ b/gitian/descriptors/mac/gitian-firefox.yml
@@ -69,7 +69,7 @@ script: |
# that feature it would hang sometimes for unknown but to libfaketime related
# reasons.
export LD_PRELOAD=""
- make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}"
+ make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts"
find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
# We need libfaketime for all the timestamps e.g. written into the libraries.
# BUT we need to exclude |make build| from it. Otherwise the build fails close
diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml
index c7efb62..7358922 100644
--- a/gitian/descriptors/windows/gitian-firefox.yml
+++ b/gitian/descriptors/windows/gitian-firefox.yml
@@ -86,7 +86,7 @@ script: |
# that feature it would hang sometimes for unknown but to libfaketime related
# reasons.
export LD_PRELOAD=""
- make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}"
+ make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts"
find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
#
mkdir -p ~/build/bin/
1
0