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

[tor-commits] [torbutton/master] Translation updates



commit 265e7cd6715ff91e51b83f5e072bf0047eed5bd0
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Date:   Tue Dec 6 14:08:06 2016 +0000

    Translation updates
---
 src/chrome/locale/ar/aboutTor.dtd            |  6 +--
 src/chrome/locale/ar/aboutTor.properties     |  6 ---
 src/chrome/locale/ar/torbutton.dtd           |  2 +
 src/chrome/locale/de/aboutTor.dtd            |  6 +--
 src/chrome/locale/de/aboutTor.properties     |  6 ---
 src/chrome/locale/de/torbutton.dtd           |  4 +-
 src/chrome/locale/es/aboutTor.dtd            |  6 +--
 src/chrome/locale/es/aboutTor.properties     |  6 ---
 src/chrome/locale/es/torbutton.dtd           |  6 ++-
 src/chrome/locale/eu/aboutTor.dtd            |  8 ++--
 src/chrome/locale/eu/aboutTor.properties     | 18 +++----
 src/chrome/locale/eu/torbutton.dtd           |  2 +
 src/chrome/locale/fa/aboutTor.dtd            |  6 +--
 src/chrome/locale/fa/aboutTor.properties     |  6 ---
 src/chrome/locale/fa/torbutton.dtd           |  2 +
 src/chrome/locale/fr/aboutTor.dtd            |  6 +--
 src/chrome/locale/fr/aboutTor.properties     |  6 ---
 src/chrome/locale/fr/torbutton.dtd           |  4 +-
 src/chrome/locale/fr/torbutton.properties    |  8 ++--
 src/chrome/locale/it/aboutTor.dtd            |  6 +--
 src/chrome/locale/it/aboutTor.properties     |  6 ---
 src/chrome/locale/it/torbutton.dtd           | 10 ++--
 src/chrome/locale/ja/aboutTor.dtd            |  6 +--
 src/chrome/locale/ja/aboutTor.properties     |  6 ---
 src/chrome/locale/ja/torbutton.dtd           |  2 +
 src/chrome/locale/ko/aboutTor.dtd            |  6 +--
 src/chrome/locale/ko/aboutTor.properties     |  6 ---
 src/chrome/locale/ko/torbutton.dtd           |  2 +
 src/chrome/locale/nl/aboutTor.dtd            |  6 +--
 src/chrome/locale/nl/aboutTor.properties     |  6 ---
 src/chrome/locale/nl/torbutton.dtd           | 20 ++++----
 src/chrome/locale/pl/aboutTor.dtd            |  6 +--
 src/chrome/locale/pl/aboutTor.properties     |  6 ---
 src/chrome/locale/pl/torbutton.dtd           |  2 +
 src/chrome/locale/pt-BR/aboutDialog.dtd      | 19 ++++++++
 src/chrome/locale/pt-BR/aboutTBUpdate.dtd    |  6 +++
 src/chrome/locale/pt-BR/aboutTor.dtd         | 60 ++++++++++++------------
 src/chrome/locale/pt-BR/aboutTor.properties  | 19 +++++---
 src/chrome/locale/pt-BR/brand.dtd            | 15 ++++--
 src/chrome/locale/pt-BR/brand.properties     | 17 +++----
 src/chrome/locale/pt-BR/torbutton.dtd        | 61 ++++++++++++++++++++----
 src/chrome/locale/pt-BR/torbutton.properties | 70 +++++++++++++++++++---------
 src/chrome/locale/ru/aboutTor.dtd            |  6 +--
 src/chrome/locale/ru/aboutTor.properties     |  6 ---
 src/chrome/locale/ru/torbutton.dtd           |  4 +-
 src/chrome/locale/sv/aboutTor.dtd            |  6 +--
 src/chrome/locale/sv/aboutTor.properties     |  6 ---
 src/chrome/locale/sv/torbutton.dtd           |  2 +
 src/chrome/locale/tr/aboutTor.dtd            |  6 +--
 src/chrome/locale/tr/aboutTor.properties     |  6 ---
 src/chrome/locale/tr/torbutton.dtd           |  2 +
 src/chrome/locale/vi/aboutTBUpdate.dtd       |  2 +-
 src/chrome/locale/vi/aboutTor.dtd            |  6 +--
 src/chrome/locale/vi/aboutTor.properties     |  6 ---
 src/chrome/locale/vi/torbutton.dtd           | 10 ++--
 src/chrome/locale/zh-CN/aboutTor.dtd         |  6 +--
 src/chrome/locale/zh-CN/aboutTor.properties  |  8 +---
 src/chrome/locale/zh-CN/torbutton.dtd        |  2 +
 58 files changed, 285 insertions(+), 276 deletions(-)

diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd
index bf90b4f..5180d7f 100644
--- a/src/chrome/locale/ar/aboutTor.dtd
+++ b/src/chrome/locale/ar/aboutTor.dtd
@@ -17,13 +17,9 @@
 <!ENTITY aboutTor.success3.label "Ù?Ù?Ù?Ù?Ù? اÙ?Ø¢Ù? تصÙ?Ø­ اÙ?اÙ?ترÙ?ت بشÙ?Ù? Ù?Ø­Ù?Ù? Ù?Ù?Ù?تÙ?.">
 <!ENTITY aboutTor.failure.label "حدث خطأ Ù?ا!">
 <!ENTITY aboutTor.failure2.label "تÙ?ر Ù?ا Ù?عÙ?Ù? Ù?Ù? Ù?ذا اÙ?Ù?تصÙ?Ø­.">
-<!ENTITY aboutTor.failure3prefix.label "Ù?Ù?Ù?ساعدةØ?  Ù?رجÙ? Ù?راسÙ?Ø© ">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "بحث">
 
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
 <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&amp;location_option=US&amp;source=tor";>
 
@@ -35,6 +31,8 @@
 <!ENTITY aboutTor.whatnextAnswer.label "Ù?ا Ù?Ù?Ø«Ù? تÙ?ر Ù?Ù? Ù?ا تحتاجÙ? Ù?Ù?تصÙ?Ø­ بشÙ?Ù? Ù?Ø­Ù?Ù? Ù?Ù?Ù?تÙ?! Ù?د تحتاج Ù?تغÙ?Ù?ر بعد عاداتÙ? أثÙ?اء اÙ?تصÙ?Ù?Ø­ Ù?ضÙ?اÙ? سرÙ?Ø© Ù?Ù?Ù?تÙ?.">
 <!ENTITY aboutTor.whatnext.label "Ù?صائح Ù?Ù?Ø­Ù?اظ عÙ?Ù? سرÙ?Ù?Ø© Ù?Ù?Ù?تÙ? »">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org";>
 <!ENTITY aboutTor.helpInfo1.label "بإÙ?Ù?اÙ?Ù? اÙ?Ù?ساعدة!">
 <!ENTITY aboutTor.helpInfo2.label "Ù?Ù?Ù?Ù?Ù? Ù?ساعدة شبÙ?Ø© تÙ?ر Ù? جعÙ?Ù?ا Ø£Ù?ثر سرعة Ù? Ù?Ù?Ù?Ø© بإحدÙ? اÙ?طرÙ? اÙ?آتÙ?Ø©:">
 <!ENTITY aboutTor.helpInfo3.label "شغÙ?Ù? Ù?Ù?طة تÙ?ر »">
diff --git a/src/chrome/locale/ar/aboutTor.properties b/src/chrome/locale/ar/aboutTor.properties
index 8befe26..45eb646 100644
--- a/src/chrome/locale/ar/aboutTor.properties
+++ b/src/chrome/locale/ar/aboutTor.properties
@@ -2,12 +2,6 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-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/
-
 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
diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd
index b0a1d30..ef13900 100644
--- a/src/chrome/locale/ar/torbutton.dtd
+++ b/src/chrome/locale/ar/torbutton.dtd
@@ -59,3 +59,5 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Ù?Ù? اÙ?Ù?Ù?Ù?Ù? Ø£Ù? بعض اÙ?خطÙ?Ø· Ù?اÙ?اÙ?Ù?Ù?Ù?ات Ù?عرÙ?ضة خطأ">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Ù?Ù?Ù?ات اÙ?خط اÙ?Ù?Ù?دÙ?Ø© Ù?Ù? طرÙ? اÙ?Ù?Ù?اÙ?ع اÙ?Ø¥Ù?Ù?ترÙ?Ù?Ù?Ø© Ù?حظÙ?رة.">
 <!ENTITY torbutton.circuit_display.title "دائرة تÙ?ر Ù?Ù?ذا اÙ?Ù?Ù?Ù?ع">
+<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual">
+<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">
diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd
index a46329f..6bed96c 100644
--- a/src/chrome/locale/de/aboutTor.dtd
+++ b/src/chrome/locale/de/aboutTor.dtd
@@ -17,13 +17,9 @@
 <!ENTITY aboutTor.success3.label "Sie können jetzt anonym im Internet surfen.">
 <!ENTITY aboutTor.failure.label "Irgend etwas lief schief!">
 <!ENTITY aboutTor.failure2.label "Tor funktioniert mit diesem Browser nicht.">
-<!ENTITY aboutTor.failure3prefix.label "Um Hilfe zu erhalten, kontaktieren Sie bitte">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "Suche">
 
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
 <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&amp;location_option=DE&amp;source=tor";>
 
@@ -35,6 +31,8 @@
 <!ENTITY aboutTor.whatnextAnswer.label "Tor ist NICHT alles was benötigt wird, um anonym zu surfen! Sie müssen eventuell einige Gewohnheiten ändern, um sicherzustellen, dass Ihre Identität geschützt bleibt.">
 <!ENTITY aboutTor.whatnext.label "Tipps, um anonym zu bleiben »">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor-Browser-Benutzerhandbuch »">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org";>
 <!ENTITY aboutTor.helpInfo1.label "Sie können helfen!">
 <!ENTITY aboutTor.helpInfo2.label "Es gibt viele Möglichkeiten, um das Tor-Netzwerk schneller und stärker zu machen:">
 <!ENTITY aboutTor.helpInfo3.label "Einen Tor-Relaisknoten betreiben »">
diff --git a/src/chrome/locale/de/aboutTor.properties b/src/chrome/locale/de/aboutTor.properties
index cb7a1fe..6c79feb 100644
--- a/src/chrome/locale/de/aboutTor.properties
+++ b/src/chrome/locale/de/aboutTor.properties
@@ -2,12 +2,6 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-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/
-
 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
diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd
index 1e3a967..880013e 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/de/torbutton.dtd
@@ -13,7 +13,7 @@
 <!ENTITY torbutton.button.tooltip "Klicken, um Torbutton zu aktivieren">
 <!ENTITY torbutton.prefs.security_settings "Tor-Browser-Sicherheitseinstellungen">
 <!ENTITY torbutton.prefs.restore_defaults "Standardeinstellungen wiederherstellen">
-<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels.">
+<!ENTITY torbutton.prefs.custom_warning "Ihre benutzerdefinierten Browser-Einstellungen haben in ungewöhnlichen Sicherheitseinstellungen resultiert. Aus Gründen der Sicherheit und Privatsphäre empfehlen wir Ihnen eine der vorgegebenen Sicherheitsstufen auszuwählen.">
 <!ENTITY torbutton.cookiedialog.title "Cookie-Schutz verwalten">
 <!ENTITY torbutton.cookiedialog.lockCol "Geschützt">
 <!ENTITY torbutton.cookiedialog.domainCol "Rechner">
@@ -59,3 +59,5 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Manche Schriftarten und Symbole könnten falsch angezeigt werden.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Von Webseiten bereitgestellte Schriftartdateien sind gesperrt.">
 <!ENTITY torbutton.circuit_display.title "Tor-Kanal für diese Seite">
+<!ENTITY torbutton.torbrowser_user_manual.label "Tor-Browser-Benutzerhandbuch">
+<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">
diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd
index 5c781c8..8f68566 100644
--- a/src/chrome/locale/es/aboutTor.dtd
+++ b/src/chrome/locale/es/aboutTor.dtd
@@ -17,13 +17,9 @@
 <!ENTITY aboutTor.success3.label "Ahora es libre de navegar por Internet anónimamente.">
 <!ENTITY aboutTor.failure.label "¡Algo fue mal!">
 <!ENTITY aboutTor.failure2.label "Tor no está funcionando en este navegador.">
-<!ENTITY aboutTor.failure3prefix.label "Para obtener asistencia, por favor contacte">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "Buscar">
 
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
 <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&amp;location_option=US&amp;source=tor";>
 
@@ -35,6 +31,8 @@
 <!ENTITY aboutTor.whatnextAnswer.label "¡Tor NO es todo lo que necesita para navegar anónimamente! Puede necesitar cambiar alguno de sus hábitos de navegación para asegurar que su identidad permanezca segura.">
 <!ENTITY aboutTor.whatnext.label "Consejos para permenecer anónimo »">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Manual de usuario del Navegador Tor »">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org";>
 <!ENTITY aboutTor.helpInfo1.label "¡Usted puede ayudar!">
 <!ENTITY aboutTor.helpInfo2.label "Hay muchas formas en que las puede ayudar a hacer la red Tor más rápida y fuerte.">
 <!ENTITY aboutTor.helpInfo3.label "Ejecutar un nodo de repetidor Tor »">
diff --git a/src/chrome/locale/es/aboutTor.properties b/src/chrome/locale/es/aboutTor.properties
index fe998a0..b0c6899 100644
--- a/src/chrome/locale/es/aboutTor.properties
+++ b/src/chrome/locale/es/aboutTor.properties
@@ -2,12 +2,6 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-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/
-
 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
diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd
index 74b9e2e..979765a 100644
--- a/src/chrome/locale/es/torbutton.dtd
+++ b/src/chrome/locale/es/torbutton.dtd
@@ -19,7 +19,7 @@
 <!ENTITY torbutton.cookiedialog.domainCol "Servidor (host)">
 <!ENTITY torbutton.cookiedialog.nameCol "Nombre">
 <!ENTITY torbutton.cookiedialog.pathCol "Ruta">
-<!ENTITY torbutton.cookiedialog.protectCookie "Cookie protegida">
+<!ENTITY torbutton.cookiedialog.protectCookie "Proteger cookie">
 <!ENTITY torbutton.cookiedialog.removeCookie "Eliminar cookie">
 <!ENTITY torbutton.cookiedialog.unprotectCookie "Desproteger cookie">
 <!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas excepto las protegidas">
@@ -41,7 +41,7 @@ Mantenga marcada esta casilla para ocultar a los sitios web detalles que pudiera
 <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "El mecanismo de representación de fuentes SVG OpenType está deshabilitado.">
 <!ENTITY torbutton.prefs.sec_gen_desc "En este nivel de seguridad, se aplican los siguientes cambios (ratón encima para detalles):">
 <!ENTITY torbutton.prefs.sec_html5_desc "Los medios de vídeo y audio HTML5 se vuelven tipo clic-para-reproducir mediante NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "En algunos sitios, podría necesitar usar el botón NoScript de barra de herramientas para habilitar estos objetos de medios.">
+<!ENTITY torbutton.prefs.sec_html5_tooltip "En algunos sitios, puede que necesite usar el botón NoScript de la barra de herramientas para habilitar estos objetos audiovisuales.">
 <!ENTITY torbutton.prefs.sec_some_jit_desc "Algunas optimizaciones de rendimiento de JavaScript están deshabilitadas.">
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT (compilador JS instantáneo optimizado), Type Inference (deducción del tipo de datos por el compilador), ASM.JS (JS intermedio para alto rendimiento de otros lenguajes)">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT (compilador JS instantáneo)">
@@ -61,3 +61,5 @@ Mantenga marcada esta casilla para ocultar a los sitios web detalles que pudiera
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Algunas fuentes e iconos pueden mostrarse de forma incorrecta.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Los ficheros de fuentes proporcionados por el sitio web están bloqueados.">
 <!ENTITY torbutton.circuit_display.title "Circuito Tor para este sitio">
+<!ENTITY torbutton.torbrowser_user_manual.label "Manual de usuario del Navegador Tor">
+<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">
diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd
index 7524fc2..2849b00 100644
--- a/src/chrome/locale/eu/aboutTor.dtd
+++ b/src/chrome/locale/eu/aboutTor.dtd
@@ -6,7 +6,7 @@
 
 <!ENTITY aboutTor.title "Tori buruz">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "KONUTZ: nabigatzaile hau zaharkituta dago.">
+<!ENTITY aboutTor.outOfDateTorOn.label "KONTUZ: nabigatzaile hau zaharkituta dago.">
 <!ENTITY aboutTor.outOfDateTorOff.label "BAITA, nabigatzaile hau zaharkituta dago.">
 <!ENTITY aboutTor.outOfDate2.label "Tipulan sakatu eta ondoren Tor Browser Bundlea egiaztatu hautatu">
 
@@ -17,13 +17,9 @@
 <!ENTITY aboutTor.success3.label "Aske zara orain Internet anonimotasunez nabigatzeko.">
 <!ENTITY aboutTor.failure.label "Zerbait gaizki joan da!">
 <!ENTITY aboutTor.failure2.label "Tor ez da nabigatzaile honetan funtzionatzen ari.">
-<!ENTITY aboutTor.failure3prefix.label "Laguntzarako, mesedez hurrengo helbidearekin harremanetan jarri">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "Bilatu">
 
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
 <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&amp;location_option=US&amp;source=tor";>
 
@@ -35,6 +31,8 @@
 <!ENTITY aboutTor.whatnextAnswer.label "Tor EZ da anonimoki nabigatzeko behar duzun guztia! Baliteke zure nabigatze ohitura batzuk aldatu behar izatea zure nortasuna seguru mantentzen dela ziurtatzeko.">
 <!ENTITY aboutTor.whatnext.label "Anonimo mantentzeko aholkuak »">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor nabigatzailearen gidaliburua »">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org";>
 <!ENTITY aboutTor.helpInfo1.label "Lagundu dezakezu!">
 <!ENTITY aboutTor.helpInfo2.label "Tor sarea bizkorragoa eta indartsuagoa egiteko hainbat modutan lagundu dezakezu:">
 <!ENTITY aboutTor.helpInfo3.label "Tor errele nodo bat exekutatu »">
diff --git a/src/chrome/locale/eu/aboutTor.properties b/src/chrome/locale/eu/aboutTor.properties
index 81d4c44..cc20896 100644
--- a/src/chrome/locale/eu/aboutTor.properties
+++ b/src/chrome/locale/eu/aboutTor.properties
@@ -2,12 +2,6 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Bilatu<a href="%1$S">modu seguruan</a> ondokoarekin: <a href="%2$S">Hasierako orria</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
 aboutTor.searchDDG.privacy=Bilatu<a href="%1$S">modu seguruan</a> ondokoarekin: <a href="%2$S">DuckDuckGo</a>.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
@@ -20,9 +14,9 @@ aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDC.search.link=https://search.disconnect.me/
 
-aboutTor.donationBanner.donate=Donate Now!
-aboutTor.donationBanner.heart=Tor is at the heart of Internet freedom
-aboutTor.donationBanner.tagline1=Millions of People Depend on Tor for Online Security & Privacy
-aboutTor.donationBanner.tagline2=A Network of People Protecting People
-aboutTor.donationBanner.tagline3=Surveillance = Oppression
-aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006
+aboutTor.donationBanner.donate=Eman dohaintza orain!
+aboutTor.donationBanner.heart=Tor Interneten askatasunaren bihotzean dago
+aboutTor.donationBanner.tagline1=Milioika pertsonak Tor-en beharra dute online segurtasun eta pribatutasunerako.
+aboutTor.donationBanner.tagline2=Jendea babesten duen jendez osaturiko sarea
+aboutTor.donationBanner.tagline3=Jagoletza = Zapalkuntza
+aboutTor.donationBanner.tagline4=2006tik kazetariak, aktibistak eta informazioa ezagutarazten dutenak babesten
diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd
index 9ef6b04..99e3e57 100644
--- a/src/chrome/locale/eu/torbutton.dtd
+++ b/src/chrome/locale/eu/torbutton.dtd
@@ -59,3 +59,5 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Webguneak hornitutako letra fitxategiak blokeatuta daude.">
 <!ENTITY torbutton.circuit_display.title "Gune honetako Tor zirkuitua">
+<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual">
+<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">
diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd
index c0ae835..b748cbe 100644
--- a/src/chrome/locale/fa/aboutTor.dtd
+++ b/src/chrome/locale/fa/aboutTor.dtd
@@ -17,13 +17,9 @@
 <!ENTITY aboutTor.success3.label "اکÙ?Ù?Ù? Ø´Ù?ا بÙ? Ø·Ù?ر Ù?اشÙ?اس بÙ? اÛ?Ù?ترÙ?ت دسترسÛ? دارÛ?د.">
 <!ENTITY aboutTor.failure.label "خطاÛ?Û? Ù¾Û?Ø´ Ø¢Ù?دÙ? است!">
 <!ENTITY aboutTor.failure2.label "تا با اÛ?Ù? Ù?رÙ?رگر کار Ù?Ù?Û?â??Ú©Ù?د.">
-<!ENTITY aboutTor.failure3prefix.label "براÛ? Ú©Ù?Ú©Ø? تÙ?اس حاصÙ? Ù?رÙ?اÛ?Û?د:">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "جستجÙ?">
 
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
 <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&amp;location_option=US&amp;source=tor";>
 
@@ -35,6 +31,8 @@
 <!ENTITY aboutTor.whatnextAnswer.label "تÙ?ر Ù?Ù?Ù?â??Û? Ù?Û?از Ø´Ù?ا براÛ? Ù?اشÙ?اس Ù?اÙ?دÙ? در Ù?ب را برآÙ?ردÙ? Ù?Ù?Û?â??Ú©Ù?د! براÛ? اطÙ?Û?Ù?اÙ? از اÛ?Ù?Ù?Û? Ù?Ù?Û?تتاÙ?Ø? Ù?Û?از دارÛ?د برخÛ? عادات Ù?بگردÛ?تاÙ? را تغÛ?Û?ر دÙ?Û?د.">
 <!ENTITY aboutTor.whatnext.label "راÙ?Ù?Ù?اÛ?Û? براÛ? Ù?اشÙ?اس Ù?اÙ?دÙ?.">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org";>
 <!ENTITY aboutTor.helpInfo1.label "Ù?Û?â??تÙ?اÙ?Û?د Ú©Ù?Ú© Ú©Ù?Û?د!">
 <!ENTITY aboutTor.helpInfo2.label "راÙ? Ù?اÛ? زÛ?ادÛ? براÛ? Ú©Ù?Ú© کردÙ? Ø´Ù?ا جÙ?ت سرÛ?عتر کردÙ? Ù? Ù?ستحکÙ? کردÙ? شبکÙ? تÙ?ر Ù?جÙ?د دارد:">
 <!ENTITY aboutTor.helpInfo3.label "Ù?سÙ?رÙ?اب تÙ?رÙ? ادارÙ? Ù?Ù?Ù?د »">
diff --git a/src/chrome/locale/fa/aboutTor.properties b/src/chrome/locale/fa/aboutTor.properties
index a591490..d7f5097 100644
--- a/src/chrome/locale/fa/aboutTor.properties
+++ b/src/chrome/locale/fa/aboutTor.properties
@@ -2,12 +2,6 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-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/
-
 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
diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd
index ad234cb..b9c8af8 100644
--- a/src/chrome/locale/fa/torbutton.dtd
+++ b/src/chrome/locale/fa/torbutton.dtd
@@ -59,3 +59,5 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc "برخÛ? از Ù?Ù?Ù?ت Ù?ا Ù? Ø¢Û?Ú©Ù?Ù? Ù?اÛ? Ù?Ù?Ú©Ù? است Ù?Ù?اÛ?Ø´ Ù?ادرست داشتÙ? باشÙ?د.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Ù?اÛ?Ù? Ù?اÛ? Ù?Ù?Ù?تÛ? Ú©Ù? در Ù?ب ساÛ?ت ارائÙ? Ù?Û? Ø´Ù?Ù?د Ù?سدÙ?د شدÙ? است.">
 <!ENTITY torbutton.circuit_display.title "Ù?دار Tor براÛ? اÛ?Ù? ساÛ?ت">
+<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual">
+<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">
diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd
index 0fc5b1e..2bb5ec4 100644
--- a/src/chrome/locale/fr/aboutTor.dtd
+++ b/src/chrome/locale/fr/aboutTor.dtd
@@ -17,13 +17,9 @@
 <!ENTITY aboutTor.success3.label "Vous êtes maintenant libre de naviguer sur Internet anonymement.">
 <!ENTITY aboutTor.failure.label "Une erreur s'est produite !">
 <!ENTITY aboutTor.failure2.label "Tor ne fonctionne pas dans ce navigateur.">
-<!ENTITY aboutTor.failure3prefix.label "Pour de l'assistance, veuillez contacter">
-<!ENTITY aboutTor.failure3Link "help-fr@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "Rechercher">
 
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
 <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&amp;location_option=US&amp;source=tor";>
 
@@ -35,6 +31,8 @@
 <!ENTITY aboutTor.whatnextAnswer.label "Tor n'est PAS tout ce dont vous avez besoin pour naviguer anonymement! Vous aurez peut-être à changer certaines de vos habitudes de navigation pour garder votre identité en sécurité.">
 <!ENTITY aboutTor.whatnext.label "Conseils pour rester anonyme »">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Guide d'utilisation du navigateur Tor »">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org";>
 <!ENTITY aboutTor.helpInfo1.label "Vous pouvez aider !">
 <!ENTITY aboutTor.helpInfo2.label "Vous pouvez aider à rendre le réseau Tor plus rapide et plus puissant de plusieurs façons :">
 <!ENTITY aboutTor.helpInfo3.label "Faire tourner un nÅ?ud relais Tor »">
diff --git a/src/chrome/locale/fr/aboutTor.properties b/src/chrome/locale/fr/aboutTor.properties
index 174b286..03f3e8e 100644
--- a/src/chrome/locale/fr/aboutTor.properties
+++ b/src/chrome/locale/fr/aboutTor.properties
@@ -2,12 +2,6 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Rechercher <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/
-
 aboutTor.searchDDG.privacy=Rechercher <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
diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd
index cf67f43..8bf6850 100644
--- a/src/chrome/locale/fr/torbutton.dtd
+++ b/src/chrome/locale/fr/torbutton.dtd
@@ -46,7 +46,7 @@
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Les scripts pourraient être exécutés plus lentement sur certains sites.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Certains mécanismes d'affichage des équations mathématiques sont désactivés.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML est désactivé.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
+<!ENTITY torbutton.prefs.sec_medium "https://www.transifex.com/otf/torproject/translate/#fr_CA/torbutton-torbuttondtd/13755783";>
 <!ENTITY torbutton.prefs.sec_all_jit_desc "Sur les sites où JavaScript est activé, les optimisations des performances sont désactivées.">
 <!ENTITY torbutton.prefs.sec_font_rend_desc "Certaines fonctions de rendu de police sont désactivées.">
 <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Le mécanisme de rendu de police Graphite est désactivé.">
@@ -59,3 +59,5 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Certains polices et icônes pourraient ne pas s'afficher correctement.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Les polices fournies par les sites Web sont bloquées.">
 <!ENTITY torbutton.circuit_display.title "Circuit Tor pour ce site">
+<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual">
+<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">
diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties
index 1568a3c..68655b5 100644
--- a/src/chrome/locale/fr/torbutton.properties
+++ b/src/chrome/locale/fr/torbutton.properties
@@ -1,11 +1,11 @@
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = IP inconnue
-torbutton.circuit_display.onion_site = Site onion
+torbutton.circuit_display.onion_site = Site Oignon
 torbutton.circuit_display.this_browser = Ce navigateur
-torbutton.circuit_display.relay = relais
+torbutton.circuit_display.relay = relayer
 torbutton.circuit_display.tor_bridge = Bridge
 torbutton.circuit_display.unknown_country = Pays inconnu
-torbutton.content_sizer.margin_tooltip = Le navigateur Tor ajoute cette marge pour s'assurer que la largeur et la hauteur de votre fenêtre soit moins distinctive, et ainsi réduire la capacité des personnes à vous repérer en ligne.
+torbutton.content_sizer.margin_tooltip = Le navigateur Tor ajoute cette marge pour rendre la largeur et la hauteur de votre fenêtre moins distinctives, et pour réduire par conséquent la possibilité que l'on vous suive à la trace en ligne.
 torbutton.panel.tooltip.disabled = Cliquer pour activer Tor
 torbutton.panel.tooltip.enabled = Cliquer pour désactiver Tor
 torbutton.panel.label.disabled = Tor Inactif
@@ -28,7 +28,7 @@ torbutton.popup.confirm_plugins = Les greffons tels que Flash peuvent nuire à v
 torbutton.popup.never_ask_again = Ne plus me poser la question.
 torbutton.popup.confirm_newnym = Le navigateur Tor va fermer toutes les fenêtres et onglets. Tous les sessions ouvertes seront perdues.\n\nVoulez-vous redémarrer le navigateur Tor maintenant pour réinitialiser votre identité ?\n\n
 
-torbutton.slider_notification = Le menu de l'oignon vert a maintenant un curseur de sécurité qui vous laisse ajuster votre niveau de sécurité. Découvrez le !
+torbutton.slider_notification = Le menu de l'oignon vert propose maintenant un curseur de sécurité qui vous laisse ajuster votre niveau de sécurité. Découvrez-le !
 torbutton.slider_notification_button = Ouvrir préférences de sécurité
 
 torbutton.maximize_warning = Maximiser le navigateur Tor à l'écran peut permettre aux sites Web de déterminer votre taille de moniteur, laquelle peut être utilisée pour vous suivre à la trace. Nous recommandons que vous laissiez les fenêtres du navigateur Tor dans leur taille d'origine.
diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd
index 17eba77..612dab3 100644
--- a/src/chrome/locale/it/aboutTor.dtd
+++ b/src/chrome/locale/it/aboutTor.dtd
@@ -17,13 +17,9 @@
 <!ENTITY aboutTor.success3.label "Ora sei libero di navigare in internet anonimamente.">
 <!ENTITY aboutTor.failure.label "Qualcosa è Andato Storto!">
 <!ENTITY aboutTor.failure2.label "Tor non sta funzionando su questo browser.">
-<!ENTITY aboutTor.failure3prefix.label "Per richiedere assistenza, contattare">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "Cerca">
 
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
 <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&amp;location_option=US&amp;source=tor";>
 
@@ -35,6 +31,8 @@
 <!ENTITY aboutTor.whatnextAnswer.label "Tor NON è tutto ciò che ti serve per navigare anonimamente! Potresti aver bisogno di cambiare le tue abitudini di navigazione per accertarti che la tua identità rimanga al sicuro.">
 <!ENTITY aboutTor.whatnext.label "Consigli Per Restare Anonimo »">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org";>
 <!ENTITY aboutTor.helpInfo1.label "Puoi Aiutare!">
 <!ENTITY aboutTor.helpInfo2.label "Ci sono molti modi in cui puoi aiutare a rendere la Rete Tor più veloce e stabile:">
 <!ENTITY aboutTor.helpInfo3.label "Gestisci un Nodo Relay di Tor »">
diff --git a/src/chrome/locale/it/aboutTor.properties b/src/chrome/locale/it/aboutTor.properties
index 58592a6..af7cd92 100644
--- a/src/chrome/locale/it/aboutTor.properties
+++ b/src/chrome/locale/it/aboutTor.properties
@@ -2,12 +2,6 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-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/
-
 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
diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd
index 414cf11..9ff051f 100644
--- a/src/chrome/locale/it/torbutton.dtd
+++ b/src/chrome/locale/it/torbutton.dtd
@@ -11,9 +11,9 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Protezioni dei Cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Fai clic per inizializzare Torbutton">
-<!ENTITY torbutton.prefs.security_settings "Tor Browser Security Settings">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels.">
+<!ENTITY torbutton.prefs.security_settings "Impostazioni di Sicurezza Tor Browser">
+<!ENTITY torbutton.prefs.restore_defaults "Ripristina Defaults">
+<!ENTITY torbutton.prefs.custom_warning "Le tue impostazioni del browser sembrano avere preferenze di sicurezza insolite. Per motivi di sicurezza e privacy, ti consigliamo di scegliere uno dei livelli di sicurezza predefiniti.">
 <!ENTITY torbutton.cookiedialog.title "Gestisci protezione Cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protetto">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -46,7 +46,7 @@
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Gli scripts su alcuni siti possono girare più lenti.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Alcuni meccanismi di visualizzazione di equazioni matematiche sono disabilitati.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML è disabilitato.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
+<!ENTITY torbutton.prefs.sec_medium "Medio">
 <!ENTITY torbutton.prefs.sec_all_jit_desc "Nei siti dove è attivato JavaScript le ottimizzazioni sono disabilitate">
 <!ENTITY torbutton.prefs.sec_font_rend_desc "Alcuni rendering dei font sono disabilitati.">
 <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Il meccanismo di rendering font Graphite è disabilitato.">
@@ -59,3 +59,5 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Alcuni caratteri e icone possono non essere visualizzati correttamente.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "I font provvisti dal sito sono bloccati.">
 <!ENTITY torbutton.circuit_display.title "Circuito Tor per questo sito">
+<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual">
+<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">
diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd
index 10844f3..850e13c 100644
--- a/src/chrome/locale/ja/aboutTor.dtd
+++ b/src/chrome/locale/ja/aboutTor.dtd
@@ -17,13 +17,9 @@
 <!ENTITY aboutTor.success3.label "ç?¾å?¨ã??è?ªç?±ã?«å?¿å??ã?§ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã??ã??ã?©ã?¦ã?ºå?ºæ?¥ã?¾ã??ã??">
 <!ENTITY aboutTor.failure.label "ä½?ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??ï¼?">
 <!ENTITY aboutTor.failure2.label "Torã?¯ã??ã??ã?®ã??ã?©ã?¦ã?¶ã?§ã?¯å??ä½?ã??ã?¾ã??ã??ã??">
-<!ENTITY aboutTor.failure3prefix.label "ã?µã??ã?¼ã??ã?«ã?¤ã??ã?¦ã?¯ã??ã??å??ã??å??ã??ã??ã??ã? ã??ã??ã??">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx ��">
-<!ENTITY aboutTor.failure3suffix.label "ã??">
 
 <!ENTITY aboutTor.search.label "�索">
 
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
 <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&amp;location_option=US&amp;source=tor";>
 
@@ -35,6 +31,8 @@
 <!ENTITY aboutTor.whatnextAnswer.label "Torã? ã??ã??å?¿å??ã?«ã??ã?©ã?¦ã?ºã??ã??ã?®ã?«å¿?è¦?ã?¨ã??ã??ã??ã??ã?§ã?¯ã?ªã??ã?®ã?§ã??ï¼? ã??ã?ªã??ã?®èº«å??ã??å®?å?¨ã?«ä¿?ã?¤ã?«ã?¯ã??ã??ã?©ã?¦ã?¸ã?³ã?°ã?®ç¿?æ?£ã?®ä¸?é?¨ã??å¤?ã??ã??å¿?è¦?ã??ã??ã??ã??ã??ã??ã??ã?¾ã??ã??ã??">
 <!ENTITY aboutTor.whatnext.label "å?¿å??æ?§ã??ä¿?ã?¤ã??ã?¨ã?«ã?¤ã??ã?¦ã?®ã??ã?³ã?? »">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org";>
 <!ENTITY aboutTor.helpInfo1.label "å?©ã??ã?¦ã??ã? ã??ã??ï¼?">
 <!ENTITY aboutTor.helpInfo2.label "Torã??ã??ã??ã?¯ã?¼ã?¯ã??ã??ã??ã?«é«?é??ã?«ã??ã??ã??ã?«å¼·å??ã?«ã??ã??ã?®ã?«å½¹ç«?ã?¦ã??ã??ã??ã??ã??ã?®ã??ã??æ?¹ã??ã??ã??ã?¾ã??ã??">
 <!ENTITY aboutTor.helpInfo3.label "Torã?ªã?¬ã?¼ã??ã?¼ã??ã??èµ·å?? »">
diff --git a/src/chrome/locale/ja/aboutTor.properties b/src/chrome/locale/ja/aboutTor.properties
index 317071d..eee047e 100644
--- a/src/chrome/locale/ja/aboutTor.properties
+++ b/src/chrome/locale/ja/aboutTor.properties
@@ -2,12 +2,6 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-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/
-
 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
diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd
index 9a7704a..a96a09e 100644
--- a/src/chrome/locale/ja/torbutton.dtd
+++ b/src/chrome/locale/ja/torbutton.dtd
@@ -59,3 +59,5 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc "ã??ã??ã?¤ã??ã?®ã??ã?©ã?³ã??ã?¨ã?¢ã?¤ã?³ã?³ã?¯æ­£å¸¸ã?«è¡¨ç¤ºã??ã??ã?¾ã??ã??ã??">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web ã?µã?¤ã??ã??æ??ä¾?ã??ã??ã??ã?©ã?³ã??ã?¯ã??ã?­ã??ã?¯ã??ã??ã?¾ã??ã??">
 <!ENTITY torbutton.circuit_display.title "ã??ã?®ã?µã?¤ã??ç?¨ã?® Tor ã?µã?¼ã?­ã??ã??">
+<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual">
+<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">
diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd
index 23ca3ac..37d751e 100644
--- a/src/chrome/locale/ko/aboutTor.dtd
+++ b/src/chrome/locale/ko/aboutTor.dtd
@@ -17,13 +17,9 @@
 <!ENTITY aboutTor.success3.label "ì?´ì ? ì??ì? ë¡­ê²? ì?µëª?ì?¼ë¡? ì?¸í?°ë?·ì?? í??ì??í?  ì?? ì??ì?µë??ë?¤.">
 <!ENTITY aboutTor.failure.label "ë­?ê°? ì??못ë??ì??ì?µë??ë?¤!">
 <!ENTITY aboutTor.failure2.label "Torë?? ì?´ ë¸?ë?¼ì?°ì ?ì??ì?? ì??ë??í??ì§? ì??ì?µë??ë?¤.">
-<!ENTITY aboutTor.failure3prefix.label "ë??ì??ì?? ì??í?´ì??, 문ì??í?´ 주ì?¸ì??">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label " ">
 
 <!ENTITY aboutTor.search.label "ê²?ì??">
 
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
 <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&amp;location_option=US&amp;source=tor";>
 
@@ -35,6 +31,8 @@
 <!ENTITY aboutTor.whatnextAnswer.label "Torë?? ì??ë²½í?? ì?µëª? ë¸?ë?¼ì?°ì§?ì?? ë³´ì?¥í??ì§? ì??ì?µë??ë?¤! ë?°ë?¼ì?? ì? ë¶?ì?? ì??ì ?í??ê²? ì? ì§?í??기 ì??í?´ì??ë?? ë¸?ë?¼ì?°ì§? ì?µê´?ì?? ë°?꾸ì??ì?¼ í?©ë??ë?¤.">
 <!ENTITY aboutTor.whatnext.label "ì?µëª?ì?¼ë¡? ì??짱거릴 ë??ì?? í?? &gt;&gt;">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org";>
 <!ENTITY aboutTor.helpInfo1.label "ì?¬ë?¬ë¶?ë?? ë??ì?¸ ì?? ì??ì?µë??ë?¤!">
 <!ENTITY aboutTor.helpInfo2.label "ì?¬ë?¬ë¶?ì?´ Tor ë?¤í?¸ì??í?¬ë¥¼ ë³´ë?¤ 빠르고 ê°?í??ê²? ë§?ë?¤ ì?? ì??ë?? ë°©ë²?ì?´ ì??ì?µë??ë?¤.">
 <!ENTITY aboutTor.helpInfo3.label "Tor ì¤?ê³? ì??ë²? node ì?¤í?? »">
diff --git a/src/chrome/locale/ko/aboutTor.properties b/src/chrome/locale/ko/aboutTor.properties
index 0f526d8..682fecb 100644
--- a/src/chrome/locale/ko/aboutTor.properties
+++ b/src/chrome/locale/ko/aboutTor.properties
@@ -2,12 +2,6 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-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/
-
 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
diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd
index aa86374..38f875d 100644
--- a/src/chrome/locale/ko/torbutton.dtd
+++ b/src/chrome/locale/ko/torbutton.dtd
@@ -59,3 +59,5 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc "ì?´ë?¤ ê¸?ì?¨ì²´ë?? ì??ì?´ì½?ì?? ì?¬ë°?르ì§? ì??ê²? í??ì??ë?  ì?? ì??ì?µë??ë?¤.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "ì?¬ì?´í?¸ ë?´ì?¥ í?°í?¸ê°? ì°¨ë?¨ë??ì??ì?µë??ë?¤.">
 <!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
+<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual">
+<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">
diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd
index 023457e..b93d0e0 100644
--- a/src/chrome/locale/nl/aboutTor.dtd
+++ b/src/chrome/locale/nl/aboutTor.dtd
@@ -17,13 +17,9 @@
 <!ENTITY aboutTor.success3.label "Je kan nu anoniem over het internet browsen.">
 <!ENTITY aboutTor.failure.label "Er ging iets mis!">
 <!ENTITY aboutTor.failure2.label "Tor werkt niet in deze browser.">
-<!ENTITY aboutTor.failure3prefix.label "Contacteer voor hulp">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "Zoeken">
 
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
 <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&amp;location_option=US&amp;source=tor";>
 
@@ -35,6 +31,8 @@
 <!ENTITY aboutTor.whatnextAnswer.label "Tor is NIET alles wat je nodig hebt om anoniem te kunnen browsen. Mogelijk is het nodig dat je bepaalde browsegewoontes verandert om te verzekeren dat je identiteit veilig blijft.">
 <!ENTITY aboutTor.whatnext.label "Tips om anoniem te blijven »">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org";>
 <!ENTITY aboutTor.helpInfo1.label "Jij kan helpen!">
 <!ENTITY aboutTor.helpInfo2.label "Er zijn veel verschillende manieren hoe jij kan helpen het Tor-netwerk sneller en sterker te maken:">
 <!ENTITY aboutTor.helpInfo3.label "Draai een Tor-relaynode »">
diff --git a/src/chrome/locale/nl/aboutTor.properties b/src/chrome/locale/nl/aboutTor.properties
index 83c190a..855de1f 100644
--- a/src/chrome/locale/nl/aboutTor.properties
+++ b/src/chrome/locale/nl/aboutTor.properties
@@ -2,12 +2,6 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-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/
-
 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
diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd
index 3b819a7..39e636c 100644
--- a/src/chrome/locale/nl/torbutton.dtd
+++ b/src/chrome/locale/nl/torbutton.dtd
@@ -1,4 +1,4 @@
-<!ENTITY torbutton.context_menu.new_identity "Nieuwe identiteit">
+<!ENTITY torbutton.context_menu.new_identity "Nieuwe Identiteit">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.new_circuit "Nieuw Tor-circuit voor deze website">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
@@ -8,26 +8,26 @@
 <!ENTITY torbutton.context_menu.networksettings.key "N">
 <!ENTITY torbutton.context_menu.downloadUpdate "Controleer op updates voor de Tor-browser...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookiebeveiligingen...">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Beveiligingen">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.button.tooltip "Klik hier om Torbutton te initialiseren">
-<!ENTITY torbutton.prefs.security_settings "Tor-browserbeveiligingsinstellingen">
+<!ENTITY torbutton.button.tooltip "Klik hier om Tor-knop te initialiseren">
+<!ENTITY torbutton.prefs.security_settings "Tor-browser Beveiligingsinstellingen">
 <!ENTITY torbutton.prefs.restore_defaults "Standaardwaarden herstellen">
-<!ENTITY torbutton.prefs.custom_warning "Je aangepaste browservoorkeuren hebben geleid tot ongebruikelijke beveiligingsinstellingen. Uit veiligheids- en privacy-overwegen raden we je aan een van de standaardbeveiligingsniveau's te kiezen.">
-<!ENTITY torbutton.cookiedialog.title "Beheer cookiebeveiligingen">
+<!ENTITY torbutton.prefs.custom_warning "Je aangepaste browservoorkeuren hebben geleid tot ongebruikelijke beveiligingsinstellingen. Uit veiligheids- en privacy-overwegingen raden we je aan één van de standaardbeveiligingsniveaus te kiezen.">
+<!ENTITY torbutton.cookiedialog.title "Beheer Cookie Beveiligingen">
 <!ENTITY torbutton.cookiedialog.lockCol "Beveiligd">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
 <!ENTITY torbutton.cookiedialog.nameCol "Naam">
 <!ENTITY torbutton.cookiedialog.pathCol "Pad">
 <!ENTITY torbutton.cookiedialog.protectCookie "Cookie beveiligen">
 <!ENTITY torbutton.cookiedialog.removeCookie "Cookie verwijderen">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "Cookiebeveiliging opheffen">
-<!ENTITY torbutton.cookiedialog.removeAllBut "Alle cookies behalve beveiligde verwijderen">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Cookie beveiliging opheffen">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Alle cookies, met uitzondering van de beveiligde, verwijderen">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Beveilig nieuwe cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beveilig nieuwe cookies niet">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Beperk cookies en andere tracking-gegevens van derden">
 <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Vink dit vakje aan om te voorkomen dat functies van je browser worden misbruikt om je te volgen op het internet. Gemodificeerde functies zijn o.a. URL's, uitzendingskanalen, de browsercache, cookies, favicons, HTTP-auth-hoofdingen, koppelingsvoorverbindingen, localStorage, mediaSource-URL's, OCSP-verzoeken, SharedWorkers en TLS-sessietickets.">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Vink dit vakje aan om te voorkomen dat functies van je browser worden misbruikt om je te volgen op het internet. Gemodificeerde functies zijn o.a. URL's, uitzendingskanalen, de browsercache, cookies, favicons, HTTP Auth headers, koppeling-voorverbindingen, lokale opslag, mediabron-URL's, OCSP-verzoeken, Gedeelde-werkers en TLS-sessietickets.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Verander details die je onderscheiden van andere Tor Browser gebruikers">
 <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Vink dit vakje aan om websites geen inzicht te geven in dingen die uniek aan je zijn, zoals je batterijstatus, computersnelheid, toetsenbordindeling, taal, geïnstalleerde plug-ins en hun locatie, netwerkstatus, schermoriëntatie, schermgrootte, zoomniveaus per site, ondersteunde bestandstypes, systeemkleuren en WebGL-mogelijkheden.">
@@ -59,3 +59,5 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Sommige lettertypen en pictogrammen worden mogelijk niet goed weergegeven. ">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Door websites aangeleverde lettertypen worden geblokkeerd.">
 <!ENTITY torbutton.circuit_display.title "Tor-circuit voor deze website">
+<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser Gebruikershandleiding">
+<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">
diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd
index e307e5b..c92a61f 100644
--- a/src/chrome/locale/pl/aboutTor.dtd
+++ b/src/chrome/locale/pl/aboutTor.dtd
@@ -17,13 +17,9 @@
 <!ENTITY aboutTor.success3.label "Możesz teraz swobodnie przeglÄ?daÄ? Internet anonimowo.">
 <!ENTITY aboutTor.failure.label "CoÅ? poszÅ?o nie tak!">
 <!ENTITY aboutTor.failure2.label "Tor nie dziaÅ?a w tej przeglÄ?darce.">
-<!ENTITY aboutTor.failure3prefix.label "Aby uzyskaÄ? pomoc, prosimy o kontakt">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "Szukaj">
 
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
 <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&amp;location_option=US&amp;source=tor";>
 
@@ -35,6 +31,8 @@
 <!ENTITY aboutTor.whatnextAnswer.label "Tor, to NIE jest wszystko czego potrzebujesz, aby przeglÄ?daÄ? sieÄ? anonimowo! ByÄ? może potrzeba bÄ?dzie zmieniÄ? niektóre Twoje nawyki internetowe, aby zapewniÄ? Twojej tożsamoÅ?ci bezpieczeÅ?stwo.">
 <!ENTITY aboutTor.whatnext.label "Porady: Jak pozostaÄ? anonimowym w internecie »">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org";>
 <!ENTITY aboutTor.helpInfo1.label "Możesz pomóc!">
 <!ENTITY aboutTor.helpInfo2.label "Istnieje wiele sposobów, abyÅ? mógÅ? uczyniÄ? sieÄ? Tor'a szybszÄ? i silniejszÄ?:">
 <!ENTITY aboutTor.helpInfo3.label "Uruchom Przekaźnikowy WÄ?zeÅ? Tora »">
diff --git a/src/chrome/locale/pl/aboutTor.properties b/src/chrome/locale/pl/aboutTor.properties
index 5a66e6a..b41a372 100644
--- a/src/chrome/locale/pl/aboutTor.properties
+++ b/src/chrome/locale/pl/aboutTor.properties
@@ -2,12 +2,6 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-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/
-
 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
diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd
index d1a76fd..1a3c8f1 100644
--- a/src/chrome/locale/pl/torbutton.dtd
+++ b/src/chrome/locale/pl/torbutton.dtd
@@ -59,3 +59,5 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Niektóre czcionki i ikony mogÄ? byÄ? wyÅ?wietlane niepoprawnie.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Pliki czcionek dostarczane przez strony internetowe sÄ? blokowane.">
 <!ENTITY torbutton.circuit_display.title "Obwód Tor dla tej strony">
+<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual">
+<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">
diff --git a/src/chrome/locale/pt-BR/aboutDialog.dtd b/src/chrome/locale/pt-BR/aboutDialog.dtd
new file mode 100644
index 0000000..1965f21
--- /dev/null
+++ b/src/chrome/locale/pt-BR/aboutDialog.dtd
@@ -0,0 +1,19 @@
+<!ENTITY project.start           "&brandShortName; foi programada por ">
+<!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
+<!ENTITY project.tpoLink         "o/a &vendorShortName;">
+<!ENTITY project.end             ", uma organização sem fins lucrativos para defender a sua privacidade e liberdade na internet.">
+
+<!ENTITY help.start              "Você gostaria de ajudar?">
+<!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://www.torproject.org/donate/donate.html.en -->
+<!ENTITY help.donateLink         "Doar">
+<!ENTITY help.or                 "ou">
+<!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en -->
+<!ENTITY help.getInvolvedLink    "envolver-se">
+<!ENTITY help.end                "!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en -->
+<!ENTITY bottomLinks.questions   "Perguntas?">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/getinvolved/relays -->
+<!ENTITY bottomLinks.grow        "Ajude a Rede Tor a crescer!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
+<!ENTITY bottomLinks.license  "Informações de licenciamento ">
+<!ENTITY tor.TrademarkStatement   "'Tor' e 'Logo da Cebola' são marcas registradas do Projeto Tor,  Inc.">
diff --git a/src/chrome/locale/pt-BR/aboutTBUpdate.dtd b/src/chrome/locale/pt-BR/aboutTBUpdate.dtd
new file mode 100644
index 0000000..c56a6d6
--- /dev/null
+++ b/src/chrome/locale/pt-BR/aboutTBUpdate.dtd
@@ -0,0 +1,6 @@
+<!ENTITY aboutTBUpdate.title "Atualizar o Navegador Tor">
+<!ENTITY aboutTBUpdate.updated "O Navegador Tor foi atualizado.">
+<!ENTITY aboutTBUpdate.linkPrefix "Para obter as informações mais recentes sobre esta versão">
+<!ENTITY aboutTBUpdate.linkLabel  "visite nosso site.">
+<!ENTITY aboutTBUpdate.linkSuffix ".">
+<!ENTITY aboutTBUpdate.changeLogHeading "Registro de modificações:">
diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd
index 9f14022..3b039f7 100644
--- a/src/chrome/locale/pt-BR/aboutTor.dtd
+++ b/src/chrome/locale/pt-BR/aboutTor.dtd
@@ -1,47 +1,47 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2015, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Sobre Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
-<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
-<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
+<!ENTITY aboutTor.outOfDateTorOn.label "AVISO: este navegador está desatualizado.">
+<!ENTITY aboutTor.outOfDateTorOff.label "AINDA, este navegador está desatualizado.">
+<!ENTITY aboutTor.outOfDate2.label "Clique na cebola e escolha Verificar Atualizações do Navegador Tor.">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.check.label "Testar as configurações de rede Tor">
 
-<!ENTITY aboutTor.success.label "Congratulations!">
-<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
-<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
-<!ENTITY aboutTor.failure.label "Something Went Wrong!">
-<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
-<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
+<!ENTITY aboutTor.success.label "Boas-vindas ao Navegador Tor!">
+<!ENTITY aboutTor.success2.label "Conectad0 à rede Tor!">
+<!ENTITY aboutTor.success3.label "Sinta-se à vontade para navegar anonimamente na Internet.">
+<!ENTITY aboutTor.failure.label "Alguma coisa deu errado!">
+<!ENTITY aboutTor.failure2.label "Tor não está funcionando neste navegador. ">
+
+<!ENTITY aboutTor.search.label "Buscar">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search";>
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&amp;location_option=US&amp;source=tor";>
 
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
-<!ENTITY aboutTor.torInfo3.label "Exit Node:">
-<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
-<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
-<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »">
+<!ENTITY aboutTor.torInfo1.label "Para mais informações:">
+<!ENTITY aboutTor.torInfo2.label "País e Endereço IP:">
+<!ENTITY aboutTor.torInfo3.label "Nó de saída:">
+<!ENTITY aboutTor.torInfo4.label "Este servidor não registra nenhuma informação sobre os seus usuários.">
+<!ENTITY aboutTor.whatnextQuestion.label "O que mais?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor N�O é tudo o que você precisa para navegar anonimamente! Para isso, você precisará mudar alguns hábitos de utilização da Internet, que garantirão a proteção da sua identidade. ">
+<!ENTITY aboutTor.whatnext.label "Dicas para garantir seu anonimato&quot;">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
-<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
-<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
-<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Manual de Uso do Navegador Tor » ">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org";>
+<!ENTITY aboutTor.helpInfo1.label "Você pode ajudar!">
+<!ENTITY aboutTor.helpInfo2.label "Existem várias maneiras de ajudar a rede Tor a tornar-se mais rápida e eficaz:">
+<!ENTITY aboutTor.helpInfo3.label "Rodar um Nó de Retransmissor Tor »">
 <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »">
+<!ENTITY aboutTor.helpInfo4.label "Trabalhar voluntariamente&quot;">
 <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation »">
+<!ENTITY aboutTor.helpInfo5.label "Fazer uma doação&quot;">
 <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
-<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
-<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »">
+<!ENTITY aboutTor.footer.label "O Projeto Tor é uma organização sem fins lucrativos - EUA 501(c)(3) -, dedicada à pesquisa, ao desenvolvimento e à educação relacionados ao anonimato e à privacidade na Internet.">
+<!ENTITY aboutTor.learnMore.label "Informe-se mais sobre o Projeto Tor&quot;">
 <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
diff --git a/src/chrome/locale/pt-BR/aboutTor.properties b/src/chrome/locale/pt-BR/aboutTor.properties
index 02088f0..6ecd449 100644
--- a/src/chrome/locale/pt-BR/aboutTor.properties
+++ b/src/chrome/locale/pt-BR/aboutTor.properties
@@ -2,14 +2,21 @@
 # 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.searchDDG.privacy=Buscar <a href="%1$S">com segurança</a> utilizando <a href="%2$S">DuckDuckGo</a>.
 # The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+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.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
 # The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
+aboutTor.searchDC.search.link=https://search.disconnect.me/
+
+aboutTor.donationBanner.donate=Doe Agora!
+aboutTor.donationBanner.heart=O Tor é o coração da liberdade na Internet
+aboutTor.donationBanner.tagline1=Milhares de pessoas dependem do Tor para Segurança & Privacidade Online
+aboutTor.donationBanner.tagline2=Uma Rede de Pessoas Protegendo Pessoas
+aboutTor.donationBanner.tagline3=Vigilância = Opressão
+aboutTor.donationBanner.tagline4=Protegendo Jornalistas, Ativistas & Denunciantes Desde 2006
diff --git a/src/chrome/locale/pt-BR/brand.dtd b/src/chrome/locale/pt-BR/brand.dtd
index 59f665e..960990d 100644
--- a/src/chrome/locale/pt-BR/brand.dtd
+++ b/src/chrome/locale/pt-BR/brand.dtd
@@ -2,7 +2,14 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY  brandShortName        "Tor Browser">
-<!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  brandShorterName      "Navegador Tor">
+<!ENTITY  brandShortName        "Navegador Tor">
+<!ENTITY  brandFullName         "Navegador Tor">
+<!ENTITY  vendorShortName       "Projeto Tor">
+<!ENTITY  trademarkInfo.part1   "Firefox e os logotipos do Firefox são marcas registradas da Fundação Mozilla.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Clique para carregar os plugins de sistema instalados">
+<!ENTITY plugins.installed.enable "Ativar plugins">
+<!ENTITY plugins.installed.disable "Desativar plugins">
+<!ENTITY plugins.installed.disable.tip "Clique para evitar o carregamento dos plugins de sistema ">
diff --git a/src/chrome/locale/pt-BR/brand.properties b/src/chrome/locale/pt-BR/brand.properties
index f63def3..d4e9519 100644
--- a/src/chrome/locale/pt-BR/brand.properties
+++ b/src/chrome/locale/pt-BR/brand.properties
@@ -2,14 +2,15 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShortName=Tor Browser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+brandShorterName=Navegador Tor
+brandShortName=Navegador Tor
+brandFullName=Navegador Tor
+vendorShortName=Projeto Tor
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Firefox Start, uma página inicial rápida com pesquisa embutida
+homePageImport=Importar sua página inicial de %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=Seleção da Página Inicial
+homePageMigrationDescription=Por favor, selecione a página inicial que você deseja usar:
 
-syncBrandShortName=Sync
+syncBrandShortName=Sincronizar
diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd
index d7de048..673c067 100644
--- a/src/chrome/locale/pt-BR/torbutton.dtd
+++ b/src/chrome/locale/pt-BR/torbutton.dtd
@@ -1,22 +1,63 @@
 <!ENTITY torbutton.context_menu.new_identity "Nova Identidade">
 <!ENTITY torbutton.context_menu.new_identity_key "Eu">
-<!ENTITY torbutton.context_menu.networksettings "Abrir Configurações de Rede">
-<!ENTITY torbutton.context_menu.downloadUpdate "Baixar atualização do pacote Tor para navegadores...">
+<!ENTITY torbutton.context_menu.new_circuit "Novo Circuito Tor para este Site">
+<!ENTITY torbutton.context_menu.new_circuit_key "C">
+<!ENTITY torbutton.context_menu.preferences "Configurações de Segurança...">
+<!ENTITY torbutton.context_menu.preferences.key "S">
+<!ENTITY torbutton.context_menu.networksettings "Configurações da Rede Tor...">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
+<!ENTITY torbutton.context_menu.downloadUpdate "Verificar atualizações do Navegador Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "Proteções para Cookies">
+<!ENTITY torbutton.context_menu.cookieProtections "Proteções contra Cookies...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.button.tooltip "Clique para iniciar o Botão do Tor">
-<!ENTITY torbutton.prefs.restore_defaults "Restaurar padrão">
+<!ENTITY torbutton.button.tooltip "Clique para iniciar o Torbutton">
+<!ENTITY torbutton.prefs.security_settings "Configurações de Segurança do Navegador Tor">
+<!ENTITY torbutton.prefs.restore_defaults "Restaurar Padrões">
+<!ENTITY torbutton.prefs.custom_warning "As configurações personalizadas do seu navegador ficaram fora do comum. Por razões de segurança e de privacidade, recomendamos que você escolha um dos níveis padrões de segurança. ">
 <!ENTITY torbutton.cookiedialog.title "Gerenciar Proteções de Cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegido">
 <!ENTITY torbutton.cookiedialog.domainCol "Hospedeiro">
 <!ENTITY torbutton.cookiedialog.nameCol "Nome">
 <!ENTITY torbutton.cookiedialog.pathCol "Caminho">
-<!ENTITY torbutton.cookiedialog.protectCookie "Protoger Cookie">
+<!ENTITY torbutton.cookiedialog.protectCookie "Proteger Cookie">
 <!ENTITY torbutton.cookiedialog.removeCookie "Remover Cookie">
 <!ENTITY torbutton.cookiedialog.unprotectCookie "Desproteger Cookie">
-<!ENTITY torbutton.cookiedialog.removeAllBut "Remover Tudo Exceto Protegidos">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remover Todos Exceto os Protegidos">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger Novos Cookies">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Não Prototeger Novos COOKIES">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de controle">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Alterar os dados que distinguem você de outros usuários do Tor Browser">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Não Proteger Novos Cookies">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de rastreamento">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Deixe esta opção sempre marcada para impedir que funcionalidades de navegação sejam usadas para rastreá-la(o) durante a sua navegação. Funcionalidades alteradas incluem janelas pop-up, canais de transmissão, o cache de memória, cookies, favicons, ">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Alterar os detalhes  que distinguem você de outros usuários do Navegador Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Deixe esta opção marcada para ocultar suas informações individuais, como o status da bateria, a performance do computados, o formato de teclado, a localização e os plugins instalados, a lista de plugins instalados, o status da sua rede, a posição de tela, o tamanho de tela, níveis de zoom de alguns sites, tipos de arquivos compatíveis, cores de sistema, e capacidade de WebGL.">
+<!ENTITY torbutton.prefs.sec_caption "Nível de Segurança">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider permite que você desabilite certas funcionalidades de navegação que podem torná-la mais vulnerável a tentativas de ataque.">
+<!ENTITY torbutton.prefs.sec_low "Baixo (padrão)">
+<!ENTITY torbutton.prefs.sec_low_usable_desc "Isto proporciona a experiência mais utilizável.">
+<!ENTITY torbutton.prefs.sec_low_desc "Nesse nível de segurança, todas as funções do navegador são ativadas. ">
+<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "O mecanismo de renderização de fonte SVG OpenType está desabilitado.">
+<!ENTITY torbutton.prefs.sec_gen_desc "Neste nível de segurança, as seguintes mudanças se aplicam (passe o mouse para mais detalhes):">
+<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video e mídia de audio torna-se clique-para-tocar através do NoScript.">
+<!ENTITY torbutton.prefs.sec_html5_tooltip "Em alguns sites, talvez você precise usar o botão da barra de ferramentas NoScript para habilitar esses objetos de mídia.">
+<!ENTITY torbutton.prefs.sec_some_jit_desc "Algumas otimizações de perfomance JavaScript estão desabilitadas.">
+<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Tipo de Inferência, ASM JS.">
+<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Linha de Base JIT.">
+<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts podem rodar mais devagar em alguns sites.">
+<!ENTITY torbutton.prefs.sec_mathml_desc "Alguns mecanismos para mostrar equações matemáticas estão desabilitados.">
+<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML foi desabilitado.">
+<!ENTITY torbutton.prefs.sec_medium "Média ">
+<!ENTITY torbutton.prefs.sec_all_jit_desc "As otimizações de performance serão desabilitadas nos sites em JavaScript estiver habilitado.">
+<!ENTITY torbutton.prefs.sec_font_rend_desc "Alguns recursos de renderização de fontes estão desabilitados.">
+<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "O mecanismo de renderização de fonte Graphite está desabilitado.">
+<!ENTITY torbutton.prefs.sec_svg_desc "Alguns tipos de imagem foram desabilitadas.">
+<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Imagens SVG foram desabilitadas.">
+<!ENTITY torbutton.prefs.sec_js_https_desc "O JavaScript é desabilitado por padrão em todos os sites não-HTTPS.">
+<!ENTITY torbutton.prefs.sec_js_desc_tooltip "O JavaScript pode ser ativado individualmente em cada site, clicando no botão da barra de ferramentas NoScript.">
+<!ENTITY torbutton.prefs.sec_high "Alto">
+<!ENTITY torbutton.prefs.sec_all_js_desc "Por padrão, o JavaScript é desabilitado em todos os sites.">
+<!ENTITY torbutton.prefs.sec_webfonts_desc "Algumas fontes e ícones podem ser exibidos incorretamente.">
+<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Arquivos de fontes fornecidos pelo sítio web estão bloqueados.">
+<!ENTITY torbutton.circuit_display.title "Circuito Tor para este site">
+<!ENTITY torbutton.torbrowser_user_manual.label "Manual de Uso do Navegador Tor">
+<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">
diff --git a/src/chrome/locale/pt-BR/torbutton.properties b/src/chrome/locale/pt-BR/torbutton.properties
index 6a58d4b..5cfb0af 100644
--- a/src/chrome/locale/pt-BR/torbutton.properties
+++ b/src/chrome/locale/pt-BR/torbutton.properties
@@ -1,27 +1,51 @@
-torbutton.panel.tooltip.disabled = Clique para habilitar Tor
-torbutton.panel.tooltip.enabled = Clique para desabilitar Tor
-torbutton.panel.label.disabled = Tor desabilitado
-torbutton.panel.label.enabled = Tor habilitado
-extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton fornece um botão para rapidamente configurar o Tor e facilmente limpar dados de navegação privados.
-torbutton.popup.external.title = Carregar conteúdo externo?
-torbutton.popup.external.app = Uma aplicação externa é necessária para manipular:\n\n
-torbutton.popup.external.note = \n\nNOTA: Aplicações externas N�O são seguras por padrão e podem desmascarar você!\n
-torbutton.popup.external.suggest = \nSe este arquivo não é confiável, você deveria salvá-lo para vê-lo quando estiver offline ou usando uma MV,\nou considere usar um proxy Tor transparente como o Tails LiveCD ou torsocks.\n
-torbutton.popup.launch = Rode a aplicação
-torbutton.popup.cancel = Cancelado
-torbutton.popup.dontask = Sempre ative aplicações a partir de agora
-torbutton.popup.prompted_language = Para proporcionar mais privacidade a você, o Torbutton pode requisitar a versão em inglês de páginas da web. Isso pode fazer com que páginas que você prefere ler na sua língua nativa apareçam em Inglês.
-torbutton.popup.no_newnym = O Torbutton não pode te dar uma nova identidade com segurança. Ele não tem acesso à Porta de Controle Tor.\n\\n\nVocê está usando o Tor Browser Bundle?
-torbutton.title.prompt_torbrowser = Informação Importante do Torbutton
-torbutton.popup.prompt_torbrowser = O Torbutton agora funciona de forma diferente: você não pode mais desliga-lo.\n\nFizemos essa mudança porque não é seguro utilizar o Torbutton em navegador que ao mesmo tempo seja usado para navegação não-Tor. Eram causados bugs demais que não pudemos resolver de nenhuma outra forma.\n\nSe você deseja continuar usando o Firefox normalmente, você deve desinstalar o Torbutton e baixar o Tor Browser Bundle. As configurações de privacidade do Tor Browser também são superiores àquelas do Firefox comum, mesmo quando era usado com o Torbutton.\n\nPara remover o Torbutton, vá em Ferramentas->Complementes->Extensões e clique no botão remover próximo ao Torbutton.
-torbutton.popup.short_torbrowser = Informação Importante do Torbutton!\n\nO Torbutton agora mantem-se sempre habilitado.\n\nClique no Torbutton para mais informações.
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = IP desconhecido
+torbutton.circuit_display.onion_site = Site Onion
+torbutton.circuit_display.this_browser = Este navegador
+torbutton.circuit_display.relay = retransmitir
+torbutton.circuit_display.tor_bridge = Ponte
+torbutton.circuit_display.unknown_country = País desconhecido
+torbutton.content_sizer.margin_tooltip = O Navegador Tor inclui esta margem para que a altura e a largura da janela sejam menos distinguíveis, o que reduz a possibilidade de que alguém rastreie a sua navegação .
+torbutton.panel.tooltip.disabled = Clique para habilitar o Tor
+torbutton.panel.tooltip.enabled = Clique para desabilitar o Tor
+torbutton.panel.label.disabled = O Tor está desabilitado
+torbutton.panel.label.enabled = O Tor está habilitado
+extensions.torbutton@xxxxxxxxxxxxxx.description = O Torbutton fornece uma opção  para  configurar as preferências do Tor e, com rapidez e facilidade,  limpar os dados de navegação privada.
+torbutton.popup.external.title = Fazer o download de um tipo de arquivo externo?
+torbutton.popup.external.app = O Navegador Tor não pode exibir este arquivo. Você precisa abri-lo com um outro aplicativo.\n\n
+torbutton.popup.external.note = Alguns tipos de arquivos podem fazer com que aplicativos se conectem à Internet sem usar o Tor.\n\n
+torbutton.popup.external.suggest = Para sua segurança, você só deve abrir arquivos baixados enquanto estiver desconectado, ou usar um Live CD do Tor, como o Tails.\n
+torbutton.popup.launch = Fazer o download do arquivo
+torbutton.popup.cancel = Cancelar
+torbutton.popup.dontask = Fazer o download dos arquivos automaticamente de agora em diante
+torbutton.popup.prompted_language = Para proporcionar-lhe mais privacidade, o Torbutton pode requisitar a versão em inglês das páginas da web. Isso pode fazer com que as páginas que você prefere ler na sua língua nativa apareçam em Inglês.
+torbutton.popup.no_newnym = O Torbutton não pode dar-lhe uma nova identidade com segurança. Ele não tem acesso à Porta de Controle do Tor.\n\nVocê está usando o Pacote do Navegador Tor?
+torbutton.title.prompt_torbrowser = Informação importante do Torbutton
+torbutton.popup.prompt_torbrowser = O Torbutton agora está funcionando de outra maneira: você não pode mais desligá-lo.\n\nNós fizemos esta mudança porque não é seguro usar o Torbutton em um navegador que também é usado para navegação não-Tor. Havia muitos bugs que nós não conseguíamos resolver de nenhum outro modo.\n\nSe você quiser continuar usando o Firefox normalmente, deverá desinstalar o Torbutton e fazer o download do Pacote do Navegador Tor. As configurações de privacidade do Navegador Tor também são superiores àquelas do Firefox comum, mesmo quando era usado com o Torbutton.\n\nPara remover o Torbutton, vá até Ferramentas->Complementos->Extensões e clique no botão Remover próximo ao Torbutton.
+torbutton.popup.short_torbrowser = Informação Importante do Torbutton!\n\nO Torbutton agora estará sempre habilitado.\n\nClique no Torbutton para mais informações.
 
-torbutton.popup.confirm_plugins = Plugins como Flash podem prejudicar sua privacidade e seu anonimato.\n\nPodem também ignorar o Tor para revelar sua localização atual e endereço IP.\n\nVocê tem certeza que deseja habilitar o uso de plugins?\n\n
-torbutton.popup.never_ask_again = Não me perguntar novamente
+torbutton.popup.confirm_plugins = Plugins como o Flash podem prejudicar sua privacidade e o seu anonimato.\n\nPode ser ainda que eles ignorem  o Tor e revelem a sua localização atual e o endereço de IP.\n\nVocê tem certeza que deseja habilitar o uso de plugins?\n\n
+torbutton.popup.never_ask_again = Não me pergunte novamente
+torbutton.popup.confirm_newnym = O navegador Tor fechará todas as janelas e abas. Todas as sessões de websites serão perdidas.\n\nVocê deseja reiniciar o navegador Tor agora para reiniciar a sua identidade?\n\n
+
+torbutton.slider_notification = O menu cebola verde agora dispõe de uma opcão que lhe permite ajustar o seu nivel de seguranca. Dê uma conferida!
+torbutton.slider_notification_button = Abra as definições de segurança.
+
+torbutton.maximize_warning = Maximizar o Navegador Tor pode permitir aos websites determinar o tamanho do seu monitor, que pode ser usado para rastreá-lo. Nós recomendamos que você deixe a janela do Navegador Tor no seu tamanho original.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Este website (%S) tentou acessar dados sobre imagem(ns) em um elemento canvas da página. Como dados de imagem do canvas podem ser usados para descobrir informações sobre seu computador, nenhum dado de imagem foi retornado desta vez.
-canvas.allow=Permitir no Futuro
+canvas.siteprompt=Este website (%S) tentou extrair dados de imagem CANVAS HTML5, que podem ser usados para identificar o seu computador.\n\nVocê deseja que o Navegador Tor permita que este website extraia dados de imagem CANVAS HTML5?
+canvas.notNow=Por enquanto, não
+canvas.notNowAccessKey=N
+canvas.allow=Permitir
 canvas.allowAccessKey=Um
-canvas.never=Nunca para esse site
-canvas.neverAccessKey=c
+canvas.never=Nunca a este site (recomendado) 
+canvas.neverAccessKey=e
+
+# Profile/startup error messages. Strings are kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+profileProblemTitle=Problema com o Perfil %S 
+profileReadOnly=Não é possível executar %S a partir de um sistema de arquivo "somente-leitura". Por favor, copie %S em um outro local antes de tentar utilizá-lo.
+profileReadOnlyMac=Não é possível executar %S a partir de um sistema de arquivo "somente-leitura". Por favor, copie %S no seu Desktop ou em uma pasta de Aplicações antes de tentar utilizá-lo.\n 
+profileAccessDenied=%S não possui permissão para acessar o perfil. Por favor, ajuste as suas permissões de arquivo de sistema e tente novamente. 
+profileMigrationFailed=Migração de seu perfil  %S existente falhou.\nNovas configurações serão utilizadas.
diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd
index bcc257a..5225aca 100644
--- a/src/chrome/locale/ru/aboutTor.dtd
+++ b/src/chrome/locale/ru/aboutTor.dtd
@@ -17,13 +17,9 @@
 <!ENTITY aboutTor.success3.label "ТепеÑ?Ñ? Ð?Ñ? можеÑ?е пÑ?оÑ?маÑ?Ñ?иваÑ?Ñ? инÑ?еÑ?неÑ?-Ñ?айÑ?Ñ? в анонимном Ñ?ежиме.">
 <!ENTITY aboutTor.failure.label "ЧÑ?о-Ñ?о поÑ?ло не Ñ?ак!">
 <!ENTITY aboutTor.failure2.label "Tor не Ñ?абоÑ?аеÑ? в Ñ?Ñ?ом бÑ?аÑ?зеÑ?е.">
-<!ENTITY aboutTor.failure3prefix.label "ЧÑ?обÑ? полÑ?Ñ?иÑ?Ñ? помоÑ?Ñ?, обÑ?аÑ?айÑ?еÑ?Ñ?:">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "Ð?оиÑ?к">
 
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
 <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&amp;location_option=US&amp;source=tor";>
 
@@ -35,6 +31,8 @@
 <!ENTITY aboutTor.whatnextAnswer.label "Tor Ð?Ð? Ñ?влÑ?еÑ?Ñ?Ñ? иÑ?Ñ?еÑ?пÑ?ваÑ?Ñ?им Ñ?Ñ?едÑ?Ñ?вом длÑ? анонимного иÑ?полÑ?зованиÑ? Ñ?еÑ?и! Ð?озможно, Ñ?Ñ?обÑ? обезопаÑ?иÑ?Ñ? Ñ?вои лиÑ?нÑ?е даннÑ?е, Ð?ам пÑ?идеÑ?Ñ?Ñ? измениÑ?Ñ? некоÑ?оÑ?Ñ?е пÑ?ивÑ?Ñ?ки Ñ?абоÑ?Ñ? в Ð?нÑ?еÑ?неÑ?е.">
 <!ENTITY aboutTor.whatnext.label "РекомендаÑ?ии длÑ? Ñ?оÑ?Ñ?анениÑ? анонимноÑ?Ñ?и »">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Ñ?Ñ?ководÑ?Ñ?во полÑ?зоваÑ?елÑ?">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org";>
 <!ENTITY aboutTor.helpInfo1.label "Ð?Ñ? можеÑ?е помоÑ?Ñ?!">
 <!ENTITY aboutTor.helpInfo2.label "Ð?Ñ?Ñ?Ñ? много Ñ?поÑ?обов Ñ?делаÑ?Ñ? Ñ?еÑ?Ñ? Tor более бÑ?Ñ?Ñ?Ñ?ой и Ñ?Ñ?Ñ?ойÑ?ивой:">
 <!ENTITY aboutTor.helpInfo3.label "Ð?апÑ?Ñ?Ñ?иÑ?Ñ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? Tor »">
diff --git a/src/chrome/locale/ru/aboutTor.properties b/src/chrome/locale/ru/aboutTor.properties
index 055faae..232db84 100644
--- a/src/chrome/locale/ru/aboutTor.properties
+++ b/src/chrome/locale/ru/aboutTor.properties
@@ -2,12 +2,6 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-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/
-
 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
diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd
index 17b9cef..b78e255 100644
--- a/src/chrome/locale/ru/torbutton.dtd
+++ b/src/chrome/locale/ru/torbutton.dtd
@@ -46,7 +46,7 @@
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "СÑ?енаÑ?ии на некоÑ?оÑ?Ñ?Ñ? Ñ?айÑ?аÑ? могÑ?Ñ? Ñ?абоÑ?аÑ?Ñ? медленнее.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Ð?екоÑ?оÑ?Ñ?е меÑ?анизмÑ? оÑ?обÑ?ажениÑ? маÑ?емаÑ?иÑ?еÑ?киÑ? Ñ?Ñ?авнений оÑ?клÑ?Ñ?енÑ?.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML оÑ?клÑ?Ñ?ен.">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
+<!ENTITY torbutton.prefs.sec_medium "СÑ?едний">
 <!ENTITY torbutton.prefs.sec_all_jit_desc "Ð?а Ñ?айÑ?аÑ? Ñ? пÑ?именением JavaScript  опÑ?имизаÑ?иÑ? оÑ?клÑ?Ñ?ена.">
 <!ENTITY torbutton.prefs.sec_font_rend_desc "Ð?екоÑ?оÑ?Ñ?е Ñ?Ñ?нкÑ?ии оÑ?Ñ?иÑ?овки Ñ?Ñ?иÑ?Ñ?ов оÑ?клÑ?Ñ?енÑ?.">
 <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Ð?еÑ?анизм визÑ?ализаÑ?ии Ñ?Ñ?иÑ?Ñ?а Graphite оÑ?клÑ?Ñ?ен.">
@@ -59,3 +59,5 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Ð?екоÑ?оÑ?Ñ?е Ñ?Ñ?иÑ?Ñ?Ñ? и знаÑ?ки могÑ?Ñ? оÑ?обÑ?ажаÑ?Ñ?Ñ?Ñ? некоÑ?Ñ?екÑ?но.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "ФайлÑ? Ñ?Ñ?иÑ?Ñ?ов, пÑ?едоÑ?Ñ?авленнÑ?е Ñ?айÑ?ом, заблокиÑ?ованÑ?">
 <!ENTITY torbutton.circuit_display.title "ЦепоÑ?ка Tor длÑ? Ñ?Ñ?ого Ñ?айÑ?а">
+<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser Ñ?Ñ?ководÑ?Ñ?во полÑ?зоваÑ?елÑ?">
+<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">
diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd
index 5f4cf5e..4e0473d 100644
--- a/src/chrome/locale/sv/aboutTor.dtd
+++ b/src/chrome/locale/sv/aboutTor.dtd
@@ -17,13 +17,9 @@
 <!ENTITY aboutTor.success3.label "Du kan nu surfa på nätet anonymt.">
 <!ENTITY aboutTor.failure.label "NÃ¥gonting gick fel!">
 <!ENTITY aboutTor.failure2.label "Tor fungerar inte i den här webbläsaren.">
-<!ENTITY aboutTor.failure3prefix.label "För assistans (på engelska), vänligen kontakta">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "Sök">
 
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
 <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&amp;location_option=SE&amp;source=tor";>
 
@@ -35,6 +31,8 @@
 <!ENTITY aboutTor.whatnextAnswer.label "Tor är INTE allt som behövs för att vara anonym på nätet! Du behöver kanske ändra några av dina vanor för att säkerställa att din identitet förblir skyddad.">
 <!ENTITY aboutTor.whatnext.label "Tips på hur man förblir anonym »">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser bruksanvisning »">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org";>
 <!ENTITY aboutTor.helpInfo1.label "Du kan hjälpa till!">
 <!ENTITY aboutTor.helpInfo2.label "Det finns många sätt du kan hjälpa till med att göra Tor-nätverket snabbare och säkrare:">
 <!ENTITY aboutTor.helpInfo3.label "Kör ett Tor-relä »">
diff --git a/src/chrome/locale/sv/aboutTor.properties b/src/chrome/locale/sv/aboutTor.properties
index 3b0ddcd..e23e864 100644
--- a/src/chrome/locale/sv/aboutTor.properties
+++ b/src/chrome/locale/sv/aboutTor.properties
@@ -2,12 +2,6 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-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/
-
 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
diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd
index 4560ccc..6789162 100644
--- a/src/chrome/locale/sv/torbutton.dtd
+++ b/src/chrome/locale/sv/torbutton.dtd
@@ -59,3 +59,5 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Vissa typsnitt ock ikoner kan visas felaktigt.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Typsnitt som tillhandahålls av webbsidor är blockerade.">
 <!ENTITY torbutton.circuit_display.title "Tor-krets för den här webbsidan">
+<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser bruksanvisning">
+<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">
diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd
index d68d838..b9ecb4d 100644
--- a/src/chrome/locale/tr/aboutTor.dtd
+++ b/src/chrome/locale/tr/aboutTor.dtd
@@ -17,13 +17,9 @@
 <!ENTITY aboutTor.success3.label "Artık Ä°nternet'te özgürce ve anonim olarak dolaÅ?abilirsiniz.">
 <!ENTITY aboutTor.failure.label "Bir Å?eyler Ters Gitti!">
 <!ENTITY aboutTor.failure2.label "Tor bu tarayıcı ile çalıÅ?mıyor.">
-<!ENTITY aboutTor.failure3prefix.label "Yardım almak için bizimle görüÅ?ün">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "Arama">
 
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
 <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&amp;location_option=US&amp;source=tor";>
 
@@ -35,6 +31,8 @@
 <!ENTITY aboutTor.whatnextAnswer.label "Tor, anonim kalmanız için gerek duyacaÄ?ınız her Å?eyi saÄ?lamaz! KimliÄ?inizin güvende kalması için bazı Ä°nternet alıÅ?kanlıklarınızı deÄ?iÅ?tirmeniz gerekebilir.">
 <!ENTITY aboutTor.whatnext.label "Anonim Kalma İpuçları »">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org";>
 <!ENTITY aboutTor.helpInfo1.label "Yardım Edebilirsiniz!">
 <!ENTITY aboutTor.helpInfo2.label "Tor aÄ?ını daha hızlı güçlü kılmaya yardımcı olabilmenin çeÅ?itli yolları var:">
 <!ENTITY aboutTor.helpInfo3.label "Tor Aktarıcı Noktası Ã?alıÅ?tır »">
diff --git a/src/chrome/locale/tr/aboutTor.properties b/src/chrome/locale/tr/aboutTor.properties
index 322cc2e..2c34500 100644
--- a/src/chrome/locale/tr/aboutTor.properties
+++ b/src/chrome/locale/tr/aboutTor.properties
@@ -2,12 +2,6 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=<a href="%2$S">Startpage</a> kullanarak <a href="%1$S">güvenli</a> arama yapın.
-# 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/
-
 aboutTor.searchDDG.privacy=<a href="%2$S">DuckDuckGo</a> kullanarak <a href="%1$S">güvenli</a> arama yapın.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index 116e0fc..5eadf22 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/tr/torbutton.dtd
@@ -59,3 +59,5 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Bazı yazı tipi ve simgeler düzgün görüntülenemeyebilir.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web sitesi tarafından sunulan yazı tipi dosyaları engellenir.">
 <!ENTITY torbutton.circuit_display.title "Bu site için Tor devresi">
+<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual">
+<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">
diff --git a/src/chrome/locale/vi/aboutTBUpdate.dtd b/src/chrome/locale/vi/aboutTBUpdate.dtd
index 3086fe2..d1c233c 100644
--- a/src/chrome/locale/vi/aboutTBUpdate.dtd
+++ b/src/chrome/locale/vi/aboutTBUpdate.dtd
@@ -1,4 +1,4 @@
-<!ENTITY aboutTBUpdate.title "Cập nhật v� Trình duy�t Tor">
+<!ENTITY aboutTBUpdate.title "Nâng cấp trình duy�t Tor">
 <!ENTITY aboutTBUpdate.updated "Trình duyá»?t Tor Ä?ã Ä?ược cập nhật">
 <!ENTITY aboutTBUpdate.linkPrefix "Dành cho những thông tin cập nhật m�i nhất v� bản phát hành này,">
 <!ENTITY aboutTBUpdate.linkLabel  "Ä?ến thÄ?m trang của chúng tôi">
diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd
index 951f44c..f788f86 100644
--- a/src/chrome/locale/vi/aboutTor.dtd
+++ b/src/chrome/locale/vi/aboutTor.dtd
@@ -17,13 +17,9 @@
 <!ENTITY aboutTor.success3.label "Bây gi� bạn sẽ tự do lư�t web ẩn danh.">
 <!ENTITY aboutTor.failure.label "Có gì Ä?ó Ä?ã sai!">
 <!ENTITY aboutTor.failure2.label "Tor không hoạt Ä?á»?ng trên trình duyá»?t này.">
-<!ENTITY aboutTor.failure3prefix.label "Ä?á»? Ä?ược trợ giúp, vui lòng liên lạc">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
 
 <!ENTITY aboutTor.search.label "Tìm kiếm">
 
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
 <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&amp;location_option=US&amp;source=tor";>
 
@@ -35,6 +31,8 @@
 <!ENTITY aboutTor.whatnextAnswer.label "Tor KHÃ?NG phải là tất cả những gì bạn cần Ä?á»? ẩn danh! Bạn cần nên thay Ä?á»?i má»?t vài thói quen lÆ°á»?t net Ä?á»? chắc chắn rằng xác minh danh tính sẽ an toàn.">
 <!ENTITY aboutTor.whatnext.label "Gợi ý cho vi�c ẩn danh »">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Hư�ng dẫn sử dụng Trình duy�t Tor »">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org";>
 <!ENTITY aboutTor.helpInfo1.label "Bạn có thá»? giúp Ä?ỡ!">
 <!ENTITY aboutTor.helpInfo2.label "Có nhi�u cách mà bạn có th� giúp mạng Tor nhanh hơn và t�t hơn.">
 <!ENTITY aboutTor.helpInfo3.label "Chạy má»?t Ä?ầu má»?i tiếp sức Tor »">
diff --git a/src/chrome/locale/vi/aboutTor.properties b/src/chrome/locale/vi/aboutTor.properties
index 7984d21..3b26bc7 100644
--- a/src/chrome/locale/vi/aboutTor.properties
+++ b/src/chrome/locale/vi/aboutTor.properties
@@ -2,12 +2,6 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Tìm kiếm <a href="%1$S">má»?t cách an toàn</a>vá»?i <a href="%2$S"> Trang bắt Ä?ầu</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
 aboutTor.searchDDG.privacy=Tìm kiếm <a href="%1$S">m�t cách an toàn</a>v�i <a href="%2$S"> DuckDuckGo</a>.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index c1b4a0a..6d27ca7 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/vi/torbutton.dtd
@@ -11,9 +11,9 @@
 <!ENTITY torbutton.context_menu.cookieProtections "Những sự bảo v� Cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Bấm chuá»?t Ä?á»? khá»?i chạy Torbutton">
-<!ENTITY torbutton.prefs.security_settings "Tor Browser Security Settings">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels.">
+<!ENTITY torbutton.prefs.security_settings "Những cài Ä?ặt bảo mật cho trình duyá»?t Tor">
+<!ENTITY torbutton.prefs.restore_defaults "Khôi phục trạng thái mặc Ä?á»?nh">
+<!ENTITY torbutton.prefs.custom_warning "Những Ä?iá»?u chá»?nh trong trình duyá»?t của bạn vừa tạo ra những lá»?i bảo mật bất thÆ°á»?ng. Vì những lý do bảo mật và riêng tÆ°, chúng tôi khuyến cáo bạn chá»?n những cấp Ä?á»? bảo mật mặc Ä?á»?nh khác.">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -46,7 +46,7 @@
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Những Ä?oạn mã trên má»?t sá»? trang có thá»? chạy chậm hÆ¡n.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "M�t vài cơ chế hi�n th� công thức toán h�c b� vô hi�u.">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathMK b� vô hi�u">
-<!ENTITY torbutton.prefs.sec_medium "Medium">
+<!ENTITY torbutton.prefs.sec_medium "Vừa phải">
 <!ENTITY torbutton.prefs.sec_all_jit_desc "Trên những trang nÆ¡i JavaScript Ä?ược cho phép, viá»?c tá»?i Æ°u hóa hiá»?u suất bá»? vô hiá»?u.">
 <!ENTITY torbutton.prefs.sec_font_rend_desc "Má»?t vài chức nÄ?ng tô vẽ phông chữ bá»? vô hiá»?u.">
 <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Cơ chế tô vẽ phông chữ Graphite b� vô hi�u.">
@@ -59,3 +59,5 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Má»?t vài phông chữ và biá»?u tượng có thá»? hiá»?n thá»? không Ä?úng.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Những tập tin phông chữ do trang web cung cấp b� chặn.">
 <!ENTITY torbutton.circuit_display.title "Ä?ầu ná»?i Tor dành cho trang này.">
+<!ENTITY torbutton.torbrowser_user_manual.label "Hư�ng dẫn sử dụng trình duy�t Tor">
+<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">
diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd
index 426ec5e..1408d98 100644
--- a/src/chrome/locale/zh-CN/aboutTor.dtd
+++ b/src/chrome/locale/zh-CN/aboutTor.dtd
@@ -17,13 +17,9 @@
 <!ENTITY aboutTor.success3.label "ç?°å?¨å?³å?¯è?ªç?±å?°å?¿å??访é?®äº?è??ç½?ã??">
 <!ENTITY aboutTor.failure.label "å?ºé??äº?ï¼?">
 <!ENTITY aboutTor.failure2.label "Tor æ? æ³?å?¨è¯¥æµ?è§?å?¨ä¸?è¿?è¡?ã??">
-<!ENTITY aboutTor.failure3prefix.label "å¦?é??帮å?©ï¼?请è??ç³»ï¼?">
-<!ENTITY aboutTor.failure3Link "help-zh@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label "ã??">
 
 <!ENTITY aboutTor.search.label "å®?å?¨ç??æ??ç´¢å¼?æ??">
 
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search";>
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
 <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&amp;location_option=US&amp;source=tor";>
 
@@ -35,6 +31,8 @@
 <!ENTITY aboutTor.whatnextAnswer.label "ä»?ä»?使ç?¨ Tor æ? æ³?å®?ç?°å?¿å??æµ?è§?ã??为äº?ç¡®ä¿?身份å®?å?¨ï¼?ä½ å?¯è?½é??è¦?æ?¹å??æ??äº?æµ?è§?ä¹ æ?¯ã??">
 <!ENTITY aboutTor.whatnext.label "å?¿å??æ??示 »">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser ç?¨æ?·æ??å?? »">
+<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org";>
 <!ENTITY aboutTor.helpInfo1.label "你��以帮��">
 <!ENTITY aboutTor.helpInfo2.label "å?¯é??è¿?å¾?å¤?æ?¹å¼?æ??ä¾?帮å?©ï¼?让 Tor ç½?ç»?å??å¾?æ?´å¿«æ?´å¼ºå¤§ï¼?">
 <!ENTITY aboutTor.helpInfo3.label "è¿?è¡? Tor 中继è??ç?¹ »">
diff --git a/src/chrome/locale/zh-CN/aboutTor.properties b/src/chrome/locale/zh-CN/aboutTor.properties
index 421ac52..7622354 100644
--- a/src/chrome/locale/zh-CN/aboutTor.properties
+++ b/src/chrome/locale/zh-CN/aboutTor.properties
@@ -2,12 +2,6 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-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/
-
 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
@@ -23,6 +17,6 @@ aboutTor.searchDC.search.link=https://search.disconnect.me/
 aboutTor.donationBanner.donate=ç«?å?³æ??å?©ï¼?
 aboutTor.donationBanner.heart=Tor æ?¯äº?è??ç½?è?ªç?±ç??æ ¸å¿?
 aboutTor.donationBanner.tagline1=æ?°ç?¾ä¸?人ä¾?é?  Tor å®?å?¨ã??ç§?å¯?å?°ä¸?ç½?
-aboutTor.donationBanner.tagline2=A Network of People Protecting People
+aboutTor.donationBanner.tagline2=人们äº?ç?¸ä¿?æ?¤ç»?æ??ç??ç½?ç»?
 aboutTor.donationBanner.tagline3=ç??è§?å?³å??è¿«
 aboutTor.donationBanner.tagline4=为记è??ã??å??å¯?è??å??æ´»å?¨äººå£«æ??ä¾?ä¿?æ?¤ï¼?ä¸?注å?¿å??å®?å?¨ 10 å¹´
diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd
index 86c18bf..55f94c3 100644
--- a/src/chrome/locale/zh-CN/torbutton.dtd
+++ b/src/chrome/locale/zh-CN/torbutton.dtd
@@ -59,3 +59,5 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc "æ??äº?å­?ä½?å??å?¾æ ?å?¯è?½æ? æ³?正确æ?¾ç¤ºã??">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "ç¦?ç?¨ç½?ç«?æ??ä¾?ç??å­?ä½?æ??件ã??">
 <!ENTITY torbutton.circuit_display.title "为此ç«?ç?¹ä½¿ç?¨ç?? Tor 线路">
+<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser ç?¨æ?·æ??å??">
+<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">

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