[tor-commits] [torbutton/master] Import new translations.

Wed Oct 30 03:22:50 UTC 2013

commit 8706001901847146458ca1b194690bf0f26bb654
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Oct 29 20:20:46 2013 -0700

    Import new translations.
---
 src/chrome/locale/de/aboutTor.dtd          |   83 +++++++++++----------
 src/chrome/locale/de/brand.dtd             |    2 +-
 src/chrome/locale/de/brand.properties      |   10 +--
 src/chrome/locale/de/browser.properties    |    4 +-
 src/chrome/locale/de/torbutton.dtd         |    6 +-
 src/chrome/locale/de/torbutton.properties  |   14 ++--
 src/chrome/locale/es/aboutTor.dtd          |   87 ++++++++++++----------
 src/chrome/locale/es/brand.dtd             |    8 +-
 src/chrome/locale/es/brand.properties      |   16 ++--
 src/chrome/locale/es/browser.properties    |    2 +-
 src/chrome/locale/es/torbutton.dtd         |    6 +-
 src/chrome/locale/es/torbutton.properties  |    2 +-
 src/chrome/locale/fa/aboutTor.dtd          |   79 +++++++++++---------
 src/chrome/locale/fa/brand.dtd             |    8 +-
 src/chrome/locale/fa/brand.properties      |   16 ++--
 src/chrome/locale/fa/browser.properties    |    2 +-
 src/chrome/locale/fa/torbutton.dtd         |    6 +-
 src/chrome/locale/fr/aboutTor.dtd          |   95 +++++++++++++-----------
 src/chrome/locale/fr/brand.dtd             |    8 +-
 src/chrome/locale/fr/brand.properties      |   14 ++--
 src/chrome/locale/fr/browser.properties    |    6 +-
 src/chrome/locale/fr/torbutton.dtd         |    6 +-
 src/chrome/locale/fr/torbutton.properties  |    4 +-
 src/chrome/locale/it/aboutTor.dtd          |   83 +++++++++++----------
 src/chrome/locale/it/brand.dtd             |    2 +-
 src/chrome/locale/it/brand.properties      |    8 +-
 src/chrome/locale/it/torbutton.dtd         |    6 +-
 src/chrome/locale/ko/aboutTor.dtd          |  109 +++++++++++++++-------------
 src/chrome/locale/ko/brand.dtd             |    8 +-
 src/chrome/locale/ko/brand.properties      |   16 ++--
 src/chrome/locale/ko/browser.properties    |   12 +--
 src/chrome/locale/ko/torbutton.dtd         |    6 +-
 src/chrome/locale/ko/torbutton.properties  |    2 +-
 src/chrome/locale/nl/aboutTor.dtd          |   83 +++++++++++----------
 src/chrome/locale/nl/brand.dtd             |    2 +-
 src/chrome/locale/nl/brand.properties      |    8 +-
 src/chrome/locale/nl/browser.properties    |    4 +-
 src/chrome/locale/nl/torbutton.dtd         |    6 +-
 src/chrome/locale/pl/aboutTor.dtd          |   81 ++++++++++++---------
 src/chrome/locale/pl/brand.dtd             |    8 +-
 src/chrome/locale/pl/brand.properties      |   16 ++--
 src/chrome/locale/pl/browser.properties    |   10 +--
 src/chrome/locale/pl/torbutton.dtd         |    6 +-
 src/chrome/locale/pl/torbutton.properties  |    2 +-
 src/chrome/locale/pt/aboutTor.dtd          |  103 ++++++++++++++------------
 src/chrome/locale/pt/brand.dtd             |    8 +-
 src/chrome/locale/pt/brand.properties      |   16 ++--
 src/chrome/locale/pt/browser.properties    |   12 +--
 src/chrome/locale/pt/torbutton.dtd         |    6 +-
 src/chrome/locale/ru/aboutTor.dtd          |   94 +++++++++++++-----------
 src/chrome/locale/ru/brand.dtd             |    4 +-
 src/chrome/locale/ru/brand.properties      |   12 +--
 src/chrome/locale/ru/browser.properties    |    4 +-
 src/chrome/locale/ru/torbutton.dtd         |    8 +-
 src/chrome/locale/ru/torbutton.properties  |    2 +-
 src/chrome/locale/vi/aboutTor.dtd          |  109 +++++++++++++++-------------
 src/chrome/locale/vi/brand.dtd             |    8 +-
 src/chrome/locale/vi/brand.properties      |   16 ++--
 src/chrome/locale/vi/browser.properties    |   12 +--
 src/chrome/locale/vi/torbutton.dtd         |    6 +-
 src/chrome/locale/vi/torbutton.properties  |    2 +-
 src/chrome/locale/zh-CN/aboutTor.dtd       |   89 +++++++++++++----------
 src/chrome/locale/zh-CN/brand.dtd          |    2 +-
 src/chrome/locale/zh-CN/brand.properties   |   10 +--
 src/chrome/locale/zh-CN/browser.properties |    2 +-
 src/chrome/locale/zh-CN/torbutton.dtd      |    6 +-
 66 files changed, 801 insertions(+), 692 deletions(-)

diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd
index 2fc51c6..de478a2 100644
--- a/src/chrome/locale/de/aboutTor.dtd
+++ b/src/chrome/locale/de/aboutTor.dtd
@@ -4,37 +4,46 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Ãœber 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 "Dieser Browser ist nicht mehr Aktuell">
+<!ENTITY aboutTor.outOfDateTorOff.label "DIESER Browser ist auch veraltet">
+<!ENTITY aboutTor.outOfDate2.label "Klicken Sie auf die Zwiebel und wÃ¤hlen Sie Tor Browser Bundle Update herunterladen.">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.check.label "Tor-Netzwerkeinstellungen testen">
 
-<!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.success.label "Herzlichen GlÃ¼ckwunsch!">
+<!ENTITY aboutTor.success2.label "Dieser Browser ist konfiguriert, Tor zu nutzen.">
+<!ENTITY aboutTor.success3.label "Sie kÃ¶nnen jetzt anonym im Internet surfen.">
+<!ENTITY aboutTor.failure.label "Irgendetwas ist schiefgegangen!">
+<!ENTITY aboutTor.failure2.label "Tor funktioniert mit diesem Browser nicht.">
+<!ENTITY aboutTor.failure3prefix.label "Um Hilfe zu erhalten kontaktieren Sie">
 <!ENTITY aboutTor.failure3Link "help at rt.torproject.org">
 <!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
+<!ENTITY aboutTor.search.label "Suchen">
+
+<!-- Note to translators: the following 18 entities are used to construct a
+   - sentence (either the SP or DDG entities are used, but not both at the
+   - same time).   In English, the sentence reads:
+   -    Search securely with Startpage.
+   - or:
+   -    Search securely with DuckDuckGo.
+   - The sentence contains two embedded links for "securely" and
+   - the search engine ("Startpage" or "DuckDuckGo").
+  -->
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Suche">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Suche">
+<!ENTITY aboutTor.searchSP.privacy.label "sicher">
+<!ENTITY aboutTor.searchDDG.privacy.label "sicher">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/deu/protect-privacy.html">
 <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "mit">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "mit">
 <!ENTITY aboutTor.searchSP.search.label "Startpage">
 <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
 <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
@@ -42,23 +51,23 @@
 <!ENTITY aboutTor.searchSP.search.afterLink.label ".">
 <!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country & 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 "ZusÃ¤tzliche Informationen:">
+<!ENTITY aboutTor.torInfo2.label "Land & IP-Adresse:">
+<!ENTITY aboutTor.torInfo3.label "Austrittsknoten:">
+<!ENTITY aboutTor.torInfo4.label "Dieser Server speichert keine Informationen Ã¼ber Besucher.">
+<!ENTITY aboutTor.whatnextQuestion.label "Was nun?">
+<!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.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.helpInfo1.label "Sie kÃ¶nnen helfen!">
+<!ENTITY aboutTor.helpInfo2.label "Es gibt viele MÃ¶glichkeiten,  das Tor-Netzwerk schneller und stÃ¤rker zu machen:">
+<!ENTITY aboutTor.helpInfo3.label "Einen Tor-Knoten betreiben Â»">
 <!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 "Ihre Dienste bereitstellen Â»">
 <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.label "Etwas spenden Â»">
 <!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 "Die Organisation "The Tor Project" ist nach dem US-Gesetz US 501(c)(3) als gemeinnÃ¼tzig eingestuft und widmet sich Forchung, Entwicklung und Schulung von AnonymitÃ¤t und Datenschutz.">
+<!ENTITY aboutTor.learnMore.label "Mehr Ã¼ber das Tor-Projekt erfahren Â»">
 <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">
diff --git a/src/chrome/locale/de/brand.dtd b/src/chrome/locale/de/brand.dtd
index 76e405d..9bb86e1 100644
--- a/src/chrome/locale/de/brand.dtd
+++ b/src/chrome/locale/de/brand.dtd
@@ -4,5 +4,5 @@
 
 <!ENTITY  brandShortName        "TorBrowser">
 <!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
+<!ENTITY  vendorShortName       "Tor-Projekt">
 <!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
diff --git a/src/chrome/locale/de/brand.properties b/src/chrome/locale/de/brand.properties
index 9ae168e..40f416f 100644
--- a/src/chrome/locale/de/brand.properties
+++ b/src/chrome/locale/de/brand.properties
@@ -4,12 +4,12 @@
 
 brandShortName=TorBrowser
 brandFullName=Tor Browser
-vendorShortName=Tor Project
+vendorShortName=Tor-Projekt
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Firefox Start, eine schnelle Startseite mit eingebauter Suche
+homePageImport=Importieren Sie ihre Startseite von %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=Startseitenauswahl
+homePageMigrationDescription=Bitte wÃ¤hlen Sie die Startseite die Sie benutzen mÃ¶chten:
 
 syncBrandShortName=Sync
diff --git a/src/chrome/locale/de/browser.properties b/src/chrome/locale/de/browser.properties
index 295a03a..7a83d9d 100644
--- a/src/chrome/locale/de/browser.properties
+++ b/src/chrome/locale/de/browser.properties
@@ -5,9 +5,9 @@ browser.startup.homepage=about:tor
 spellchecker.dictionary=en_US
 
 # Default search engine
-browser.search.defaultenginename=Startpage
+browser.search.defaultenginename=Startseite
 
 # Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Startpage
+browser.search.order.1=Startseite
 browser.search.order.2=DuckDuckGo
 browser.search.order.3=Google
diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd
index 12fb12e..4b58e46 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/de/torbutton.dtd
@@ -116,10 +116,10 @@
 <!ENTITY torbutton.prefs.no_proxy_warning "Warnung: Vermeiden Sie es, oben irgendwelche Host Namen zu verwenden">
 <!ENTITY torbutton.prefs.spoofreresh "Aktualisiere Tarnung">
 <!ENTITY torbutton.prefs.refereroptions " Einstellungen Absendertarnung">
-<!ENTITY torbutton.prefs.nospoof "Tarne nicht den Absender">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.spoofroot "Tarne den enthaltenen Ordner auf der Seite">
 <!ENTITY torbutton.prefs.spoofdomain "Tarne die Domain als Absender">
-<!ENTITY torbutton.prefs.spoofblank "Leeren Absender erstellen ">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "Verwalte Cookie-Schutz">
 <!ENTITY torbutton.cookiedialog.lockCol "GeschÃ¼tzt">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -131,7 +131,7 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Entferne alle, auÃŸer die geschÃ¼tzten">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "SchÃ¼tze neue Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "SchÃ¼tze nicht neue Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Aktualisierungen von Livemarks wÃ¤hrend der Benutzung von Tor deaktivieren.">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(empfohlen)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(kritisch)">
diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties
index a27a69b..6e9dff2 100644
--- a/src/chrome/locale/de/torbutton.properties
+++ b/src/chrome/locale/de/torbutton.properties
@@ -1,14 +1,14 @@
-torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.disabled = Tor aktivieren
 torbutton.button.tooltip.enabled = Tor deaktivieren
-torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren
 torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren
-torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.disabled = Klicken, um Plugins zu aktivieren
 torbutton.panel.plugins.enabled = Klicken, um Plugins zu deaktivieren
 torbutton.panel.label.disabled = Tor deaktiviert
-torbutton.panel.label.enabled = Tor Enabled
+torbutton.panel.label.enabled = Tor aktiviert
 extensions.torbutton at torproject.org.description = Torbutton gibt ihnen die MÃ¶glichkeit, Einstellungen von Tor schnell und einfach zu verÃ¤ndern und die Browser-Daten zu lÃ¶schen.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.history.warning = Torbutton hat aktivitÃ¤ten in einem Tab blockiert, welches in einem anderen Tor-Status geladen wurde.\n\nDas ist nÃ¶tig, um die Firefox Bugs 409737 und 417869 zu umgehen.\n\nSollte dieses PopUp anscheinlich grundlos auftauchen, so versucht gerade einer Ihrer Tabs sich im Hintergrund neu zu laden, und wurde deshalb blockiert.\n\nUm das Tab in diesem Tor-Status neu zu laden, drÃ¼cken Sie 'Enter' in der URL eingabebox\n\n
+torbutton.popup.plugin.warning = Torbutton hat das direkte laden von Plugin-Inhalten Ã¼ber Tor blockiert.\n\nBenutzen Sie stattdessen 'Speichern unter'.\n\n
 torbutton.popup.confirm_ca_certs = Anmerkung: Es scheint, als seien keinerlei eigene ZertifikatsautoritÃ¤ten in Ihrer Konfiguration vorhanden. Die Auswertung der globalen ZertifikationsautoritÃ¤ten-Liste ist aufwÃ¤ndig und verlangsamt das schnelle An- und Abschalten von Tor. MÃ¶chten Sie die Isolation von ZertifikatsautoritÃ¤ten abschalten? (Wenn Sie nicht wissen, was gemeint ist, kÃ¶nnen Sie ruhig auf OK klicken)
 torbutton.popup.ff3.warning = Warnung!\n\nEs ist bekannt, dass Torbutton auf Firefox 3 deine Zeitzone und Livemarks via Tor mitteilt.\n\nWillst du trotzem fortfahren?
 torbutton.popup.toggle.warning = Die Einstellungen werden erst nach einem Neustart von Tor wirksam
@@ -36,7 +36,7 @@ torbutton.popup.redirect = Umleiten
 torbutton.popup.no_redirect = Nicht umleiten
 torbutton.popup.prompted_language = Um Ihre PrivatsphÃ¤re zu erhÃ¶hen, kann Torbutton die jeweilige englische Version einer Website anfordern. Dies kann zur Folge haben, dass Websites, die sie lieber in Ihrer Muttersprache lesen wÃ¼rden, nun in Englisch dargestellt werden. \n\nSollen nun - zur ErhÃ¶hung Ihrer PrivatsphÃ¤re - Websites in Englisch geladen werden?
 torbutton.popup.no_newnym = Torbutton kann dir keine neue IdentitÃ¤t geben, da es keinen Zugriff auf den Tor-Control-Port hatt.\n\nBenutzt du das Tor-Browser-Paket?
-torbutton.popup.use_tbb = Es scheint, als wÃ¼rdest du Torbutton zusammen mit Freifox benutzen. Diese Kombination ist nicht lÃ¤nger eine empfohlene, sichere, Konfiguration.\n\nAnstelle dieser Konfiguration, empfehlen wir dir das neueste Tor-Browser-Paket zu benutzen, das du durch eine E-Mail an gettor at torproject.org oder von der Downloadseite bekommen kannst: 
+torbutton.popup.use_tbb = Es scheint, als wÃ¼rdest du Torbutton zusammen mit Freifox benutzen. Diese Kombination ist nicht lÃ¤nger eine empfohlene, sichere, Konfiguration.\n\nAnstelle dieser Konfiguration, empfehlen wir dir das neueste Tor-Browser-Paket zu benutzen, das du durch eine E-Mail an gettor at torproject.org oder von der Downloadseite bekommen kannst:
 torbutton.popup.pref_error = Torbutton kann Einstellungen in dem Tor-Browser Verzeichniss nicht aktualisieren.
 torbutton.popup.permission_denied = Bitte setze entweder die Berechtigungen des Tor-Browser Verzeichnisses zurÃ¼ck, oder kopiere es an einen neuen Ort.
 torbutton.popup.device_full = Es scheint als wÃ¼rde die Disk voll sein. Bitte machen sie etwas Platz frei, oder bewegen sie den Tor-Browser auf ein neues GerÃ¤t.
diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd
index 2fc51c6..57f24f7 100644
--- a/src/chrome/locale/es/aboutTor.dtd
+++ b/src/chrome/locale/es/aboutTor.dtd
@@ -4,61 +4,70 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Acerca de 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 "SIN EMBARGO, este navegador no estÃ¡ actualizado.">
+<!ENTITY aboutTor.outOfDateTorOff.label "ADEMÃS, este navegador tampoco estÃ¡ actualizado.">
+<!ENTITY aboutTor.outOfDate2.label "Haga clic en la cebolla y luego elija 'Descargar actualizaciÃ³n del Paquete de Navegador Tor'.">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.check.label "Probar las preferencias de red 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.success.label "Â¡Felicidades!">
+<!ENTITY aboutTor.success2.label "Este navegador estÃ¡ configurado para usar Tor.">
+<!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 at rt.torproject.org">
-<!ENTITY aboutTor.failure3suffix.label ".">
+<!ENTITY aboutTor.failure3suffix.label ",">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
+<!ENTITY aboutTor.search.label "Buscar">
+
+<!-- Note to translators: the following 18 entities are used to construct a
+   - sentence (either the SP or DDG entities are used, but not both at the
+   - same time).   In English, the sentence reads:
+   -    Search securely with Startpage.
+   - or:
+   -    Search securely with DuckDuckGo.
+   - The sentence contains two embedded links for "securely" and
+   - the search engine ("Startpage" or "DuckDuckGo").
+  -->
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Busque">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Busque">
+<!ENTITY aboutTor.searchSP.privacy.label "con seguridad">
+<!ENTITY aboutTor.searchDDG.privacy.label "con seguridad">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/esp/protect-privacy.html">
 <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "con">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "con">
 <!ENTITY aboutTor.searchSP.search.label "Startpage">
 <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
+<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/esp">
 <!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
 <!ENTITY aboutTor.searchSP.search.afterLink.label ".">
 <!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country & 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 "InformaciÃ³n adicional:">
+<!ENTITY aboutTor.torInfo2.label "PaÃs y direcciÃ³n IP:">
+<!ENTITY aboutTor.torInfo3.label "Nodo de salida:">
+<!ENTITY aboutTor.torInfo4.label "Este servidor no registra informaciÃ³n alguna de los visitantes.">
+<!ENTITY aboutTor.whatnextQuestion.label "Â¿QuÃ© es lo siguiente?">
+<!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.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.helpInfo1.label "Â¡Usted puede ayudar!">
+<!ENTITY aboutTor.helpInfo2.label "Hay muchas formas en las puede ayudar a hacer la red Tor mÃ¡s rÃ¡pida y fuerte.">
+<!ENTITY aboutTor.helpInfo3.label "Ejecutar un nodo de repetidor 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 "Ofrece voluntariamente tus servicios Â»">
 <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.label "Realiza una donaciÃ³n Â»">
 <!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 "El Projecto Tor es una US 501(c)(3) sin Ã¡nimo de lucro dedicada a la investigaciÃ³n, desarrollo y educaciÃ³n sobre anonimidad y privacidad en lÃnea.">
+<!ENTITY aboutTor.learnMore.label "Aprenda mÃ¡s acerca del El Proyecto Tor Â»">
 <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">
diff --git a/src/chrome/locale/es/brand.dtd b/src/chrome/locale/es/brand.dtd
index 76e405d..b2fd420 100644
--- a/src/chrome/locale/es/brand.dtd
+++ b/src/chrome/locale/es/brand.dtd
@@ -2,7 +2,7 @@
    - 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        "TorBrowser">
-<!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  brandShortName        "NavegadorTor">
+<!ENTITY  brandFullName         "Navegador Tor">
+<!ENTITY  vendorShortName       "Proyecto Tor">
+<!ENTITY  trademarkInfo.part1   "Firefox y los logotipos de Firefox son marcas registradas de la Mozilla Foundation.">
diff --git a/src/chrome/locale/es/brand.properties b/src/chrome/locale/es/brand.properties
index 9ae168e..3015f97 100644
--- a/src/chrome/locale/es/brand.properties
+++ b/src/chrome/locale/es/brand.properties
@@ -2,14 +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/.
 
-brandShortName=TorBrowser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+brandShortName=NavegadorTor
+brandFullName=Navegador Tor
+vendorShortName=Proyecto Tor
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Inicio de Firefox, una pÃ¡gina principal rÃ¡pida con bÃºsqueda integrada
+homePageImport=Importe su pÃ¡gina principal desde %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=SelecciÃ³n de pÃ¡gina principal
+homePageMigrationDescription=Por favor seleccione la pÃ¡gina principal que le gustarÃa usar:
 
-syncBrandShortName=Sync
+syncBrandShortName=SincronizaciÃ³n
diff --git a/src/chrome/locale/es/browser.properties b/src/chrome/locale/es/browser.properties
index 295a03a..b236c3c 100644
--- a/src/chrome/locale/es/browser.properties
+++ b/src/chrome/locale/es/browser.properties
@@ -2,7 +2,7 @@
 browser.startup.homepage=about:tor
 
 # Spell checker dictionary
-spellchecker.dictionary=en_US
+spellchecker.dictionary=es-ES
 
 # Default search engine
 browser.search.defaultenginename=Startpage
diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd
index 69a4668..43aa7cd 100644
--- a/src/chrome/locale/es/torbutton.dtd
+++ b/src/chrome/locale/es/torbutton.dtd
@@ -116,10 +116,10 @@
 <!ENTITY torbutton.prefs.no_proxy_warning "Advertencia: Evite usar los nombres de servidor (host) citados arriba">
 <!ENTITY torbutton.prefs.spoofreresh "Simular refresco de pÃ¡gina">
 <!ENTITY torbutton.prefs.refereroptions "Opciones de simulaciÃ³n del referer (remitente, direcciÃ³n desde la que accede a la actual)">
-<!ENTITY torbutton.prefs.nospoof "No simular referer">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.spoofroot "Simular la direcciÃ³n de la carpeta que contiene la pÃ¡gina">
 <!ENTITY torbutton.prefs.spoofdomain "Simular que el dominio de la pÃ¡gina es el referer">
-<!ENTITY torbutton.prefs.spoofblank "Poner en blanco el referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "Administrar protecciones de cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegidas">
 <!ENTITY torbutton.cookiedialog.domainCol "Servidor (host)">
@@ -131,7 +131,7 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas excepto las protegidas">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger las nuevas cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No proteger las nuevas cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Deshabilitar actualizaciones de marcadores dinÃ¡micos (livemarks) al usar Tor">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recomendado)">
 <!ENTITY torbutton.prefs.dtd_optional "(opcional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties
index 395f3db..ad2dc91 100644
--- a/src/chrome/locale/es/torbutton.properties
+++ b/src/chrome/locale/es/torbutton.properties
@@ -36,7 +36,7 @@ torbutton.popup.redirect = Redirigir
 torbutton.popup.no_redirect = No redirigir
 torbutton.popup.prompted_language = Para darle mayor privacidad, Torbutton puede solicitar la versiÃ³n en inglÃ©s de las pÃ¡ginas web. Esto podrÃa causar que pÃ¡ginas que prefiera leer en su idioma nativo se muestren en inglÃ©s en su lugar. \n \nÂ¿Le gustarÃa solicitar pÃ¡ginas web en inglÃ©s para mejor privacidad?
 torbutton.popup.no_newnym = Torbutton no puede darle una nueva identidad (instancia de Tor) de forma segura. No tiene acceso al puerto de control de Tor (ControlPort)\n\nÂ¿EstÃ¡ ejecutando el Paquete de Navegador Tor?
-torbutton.popup.use_tbb = Parece que estÃ¡ usando Torbutton con Firefox, cuya combinaciÃ³n dejÃ³ de ser una configuraciÃ³n segura recomendada.\n\nEn su lugar, recomendamos que obtenga el Ãºltimo Paquete de Navegador Tor enviando un correo a gettor at torproject.org o descargÃ¡ndolo en la siguiente URL: 
+torbutton.popup.use_tbb = Parece que estÃ¡ usando Torbutton con Firefox, cuya combinaciÃ³n dejÃ³ de ser una configuraciÃ³n segura recomendada.\n\nEn su lugar, recomendamos que obtenga el Ãºltimo Paquete de Navegador Tor enviando un correo a gettor at torproject.org o descargÃ¡ndolo en la siguiente URL:
 torbutton.popup.pref_error = Torbutton no puede actualizar las preferencias en la carpeta de perfiles del Navegador Tor.
 torbutton.popup.permission_denied = Permiso denegado: reinicie los permisos de la carpeta del Navegador Tor o bien cÃ³pielo a una nueva ubicaciÃ³n.
 torbutton.popup.device_full = El disco parece estar lleno. Libere espacio o mueva el Navegador Tor a un nuevo dispositivo.
diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd
index 2fc51c6..1686f9a 100644
--- a/src/chrome/locale/fa/aboutTor.dtd
+++ b/src/chrome/locale/fa/aboutTor.dtd
@@ -4,37 +4,46 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Ø¯Ø±Ø¨Ø§Ø±Ù‡â€ŒÛŒ ØªÙˆØ±">
 
-<!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 "">
+<!ENTITY aboutTor.outOfDateTorOff.label "">
+<!ENTITY aboutTor.outOfDate2.label "">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.check.label "ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø´Ø¨Ú©Ù‡â€ŒÛŒ ØªÙˆØ± Ø±Ø§ Ø¨Ø±Ø±Ø³ÛŒ Ú©Ù†ÛŒØ¯">
 
-<!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.success.label "ØªØ¨Ø±ÛŒÚ©!">
+<!ENTITY aboutTor.success2.label "Ø§ÛŒÙ† Ù…Ø±ÙˆØ±Ú¯Ø± Ø¨Ø±Ø§ÛŒ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² ØªÙˆØ± ØªÙ†Ø¸ÛŒÙ… Ø´Ø¯Ù‡ Ø§Ø³Øª.">
+<!ENTITY aboutTor.success3.label "Ø§Ú©Ù†ÙˆÙ† Ø´Ù…Ø§ Ø¨Ù‡ Ø·ÙˆØ± Ù†Ø§Ø´Ù†Ø§Ø³ Ø¨Ù‡ Ø§ÛŒÙ†ØªØ±Ù†Øª Ø¯Ø³ØªØ±Ø³ÛŒ Ø¯Ø§Ø±ÛŒØ¯.">
+<!ENTITY aboutTor.failure.label "Ø®Ø·Ø§ÛŒÛŒ Ù¾ÛŒØ´ Ø¢Ù…Ø¯Ù‡ Ø§Ø³Øª!">
+<!ENTITY aboutTor.failure2.label "ØªØ§ Ø¨Ø§ Ø§ÛŒÙ† Ù…Ø±ÙˆØ±Ú¯Ø± Ú©Ø§Ø± Ù†Ù…ÛŒâ€ŒÚ©Ù†Ø¯.">
+<!ENTITY aboutTor.failure3prefix.label "Ø¨Ø±Ø§ÛŒ Ú©Ù…Ú©ØŒ ØªÙ…Ø§Ø³ ØØ§ØµÙ„ ÙØ±Ù…Ø§ÛŒÛŒØ¯:">
 <!ENTITY aboutTor.failure3Link "help at rt.torproject.org">
 <!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
+<!ENTITY aboutTor.search.label "Ø¬Ø³ØªØ¬Ùˆ">
+
+<!-- Note to translators: the following 18 entities are used to construct a
+   - sentence (either the SP or DDG entities are used, but not both at the
+   - same time).   In English, the sentence reads:
+   -    Search securely with Startpage.
+   - or:
+   -    Search securely with DuckDuckGo.
+   - The sentence contains two embedded links for "securely" and
+   - the search engine ("Startpage" or "DuckDuckGo").
+  -->
+<!ENTITY aboutTor.searchSPPost.link "">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Ø¬Ø³ØªØ¬Ùˆ">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Ø¬Ø³ØªØ¬Ùˆ">
+<!ENTITY aboutTor.searchSP.privacy.label "Ø¨ØµÙˆØ±Øª Ø§Ù…Ù†">
+<!ENTITY aboutTor.searchDDG.privacy.label "Ø¨ØµÙˆØ±Øª Ø§Ù…Ù†">
+<!ENTITY aboutTor.searchSP.privacy.link "">
 <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
 <!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
 <!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
 <!ENTITY aboutTor.searchSP.search.label "Startpage">
 <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
 <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
@@ -42,23 +51,23 @@
 <!ENTITY aboutTor.searchSP.search.afterLink.label ".">
 <!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country & 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 "Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¨ÙŠØ´ØªØ±">
+<!ENTITY aboutTor.torInfo2.label "ÙƒØ´ÙˆØ± Ùˆ Ø¢Ø¯Ø±Ø³ Ø¢Ù‰ Ù¾ÛŒ:">
+<!ENTITY aboutTor.torInfo3.label "Ù…Ø³ÙŠØ±ÙŠØ§Ø¨ Ù…Ø®Ø±Ø¬">
+<!ENTITY aboutTor.torInfo4.label "">
+<!ENTITY aboutTor.whatnextQuestion.label "">
+<!ENTITY aboutTor.whatnextAnswer.label "ØªÙˆØ± Ù‡Ù…Ù‡â€ŒÛŒ Ù†ÛŒØ§Ø² Ø´Ù…Ø§ Ø¨Ø±Ø§ÛŒ Ù†Ø§Ø´Ù†Ø§Ø³ Ù…Ø§Ù†Ø¯Ù† Ø¯Ø± ÙˆØ¨ Ø±Ø§ Ø¨Ø±Ø¢ÙˆØ±Ø¯Ù‡ Ù†Ù…ÛŒâ€ŒÚ©Ù†Ø¯! Ø¨Ø±Ø§ÛŒ Ø§Ø·Ù…ÛŒÙ†Ø§Ù† Ø§Ø² Ø§ÛŒÙ…Ù†ÛŒ Ù‡ÙˆÛŒØªØªØ§Ù†ØŒ Ù†ÛŒØ§Ø² Ø¯Ø§Ø±ÛŒØ¯ Ø¨Ø±Ø®ÛŒ Ø¹Ø§Ø¯Ø§Øª ÙˆØ¨Ú¯Ø±Ø¯ÛŒØªØ§Ù† Ø±Ø§ ØªØºÛŒÛŒØ± Ø¯Ù‡ÛŒØ¯.">
+<!ENTITY aboutTor.whatnext.label "Ø±Ø§Ù‡Ù†Ù…Ø§ÛŒÛŒ Ø¨Ø±Ø§ÛŒ Ù†Ø§Ø´Ù†Ø§Ø³ Ù…Ø§Ù†Ø¯Ù†.">
 <!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.helpInfo1.label "Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ú©Ù…Ú© Ú©Ù†ÛŒØ¯!">
+<!ENTITY aboutTor.helpInfo2.label "">
+<!ENTITY aboutTor.helpInfo3.label "Ù…Ø³ÙŠØ±ÙŠØ§Ø¨ ØªÙˆØ±Ù‰ Ø§Ø¯Ø§Ø±Ù‡ ÙƒÙ†ÙŠØ¯ Â»">
 <!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 "Ø¯Ø§ÙˆØ·Ù„Ø¨ Ø´ÙˆÙŠØ¯ Â»">
 <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.label "Ø§Ù‡Ø¯Ø§ ÙƒÙ†ÙŠØ¯ Â»">
 <!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 "Ù¾Ø±ÙˆÚ˜Ù‡Ù” ØªÙˆØ± Ø³Ø§Ø²Ù…Ø§Ù† ØºÛŒØ± Ø§Ù†ØªÙØ§Ø¹ÛŒ Ø¢Ù…Ø±ÛŒÚ©Ø§ÛŒÛŒ 501(c)3 Ù…Ø®ØªØµ Ù¾Ú˜ÙˆÙ‡Ø´, ØªÙˆØ³Ø¹Ù‡ Ùˆ Ø¢Ù…ÙˆØ²Ø´ Ø¯Ø± Ø²Ù…ÛŒÙ† Ù†Ø§Ø´Ù†Ø§Ø³ÛŒ Ùˆ ØØ±ÛŒÙ… Ø´Ø®ØµÛŒ Ø¢Ù†Ù„Ø§ÙŠÙ† Ù‡Ø³Øª.">
+<!ENTITY aboutTor.learnMore.label "Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¨ÛŒØ´ØªØ± Ø¯Ø± Ù¾Ø±ÙˆÚ˜Ù‡Ù” ØªÙˆØ± ÙƒØ³Ø¨ ÙƒÙ†ÙŠØ¯">
 <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">
diff --git a/src/chrome/locale/fa/brand.dtd b/src/chrome/locale/fa/brand.dtd
index 76e405d..f6b21e0 100644
--- a/src/chrome/locale/fa/brand.dtd
+++ b/src/chrome/locale/fa/brand.dtd
@@ -2,7 +2,7 @@
    - 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        "TorBrowser">
-<!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  brandShortName        "Ù…Ø±ÙˆØ±Ú¯Ø± ØªÙˆØ±">
+<!ENTITY  brandFullName         "Ù…Ø±ÙˆØ±Ú¯Ø± ØªÙˆØ±">
+<!ENTITY  vendorShortName       "Ù¾Ø±ÙˆÚ˜Ù‡Ù” ØªÙˆØ±">
+<!ENTITY  trademarkInfo.part1   "">
diff --git a/src/chrome/locale/fa/brand.properties b/src/chrome/locale/fa/brand.properties
index 9ae168e..fcf2e20 100644
--- a/src/chrome/locale/fa/brand.properties
+++ b/src/chrome/locale/fa/brand.properties
@@ -2,14 +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/.
 
-brandShortName=TorBrowser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+brandShortName=Ù…Ø±ÙˆØ±Ú¯Ø± ØªÙˆØ±
+brandFullName=Ù…Ø±ÙˆØ±Ú¯Ø± ØªÙˆØ±
+vendorShortName=Ù¾Ø±ÙˆÚ˜Ù‡Ù” ØªÙˆØ±
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=ØµÙØÙ‡Ù” Firefox Start, ØµÙØÙ‡Ù” Ø®Ø§Ù†Ú¯ÛŒ ØªÙ†Ø¯ Ø¨Ø§ Ù…ÙˆØªÙˆØ± Ø¬Ø³ØªØ¬Ùˆ
+homePageImport=ØµÙØÙ‡â€ŒÙ” Ø®Ø§Ù†Ú¯ÛŒØªØ§Ù†â€ŒØ±Ø§ Ø§Ø² %S ÙˆØ§Ø±Ø¯ ÙƒÙ†ÙŠØ¯
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=Ø§Ù†ØªØ®Ø§Ø¨ ØµÙØÙ‡Ù” Ø®Ø§Ù†Ú¯ÛŒ
+homePageMigrationDescription=Ø¨ÙØ±Ù…Ø§ÛŒÛŒØ¯ ØµÙØÙ‡Ù” Ø®Ø§Ù†Ú¯ÛŒ Ø§Ù†ØªØ®Ø§Ø¨ Ú¯Ù†ÛŒØ¯:
 
-syncBrandShortName=Sync
+syncBrandShortName=Ù‡Ù…Ú¯Ø§Ù…â€ŒØ³Ø§Ø²ÛŒ
diff --git a/src/chrome/locale/fa/browser.properties b/src/chrome/locale/fa/browser.properties
index 295a03a..37e0215 100644
--- a/src/chrome/locale/fa/browser.properties
+++ b/src/chrome/locale/fa/browser.properties
@@ -10,4 +10,4 @@ browser.search.defaultenginename=Startpage
 # Search engine order (order displayed in the search bar dropdown)
 browser.search.order.1=Startpage
 browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
+browser.search.order.3=Ú¯ÙˆÚ¯Ù„ Ú©Ø§Ù†Ø§Ø¯Ø§
diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd
index b35a395..d0514a0 100644
--- a/src/chrome/locale/fa/torbutton.dtd
+++ b/src/chrome/locale/fa/torbutton.dtd
@@ -116,10 +116,10 @@
 <!ENTITY torbutton.prefs.no_proxy_warning "Ù‡Ø´Ø¯Ø§Ø±: Ø§Ø² Ø¨Ù‡ Ú©Ø§Ø± Ø¨Ø±Ø¯Ù† Ù‡Ø± Ú¯ÙˆÙ†Ù‡ Ù†Ø§Ù… Ù…ÙŠØ²Ø¨Ø§Ù† (hostname) Ø¯Ø± Ø¨Ø§Ù„Ø§ Ø¨Ù¾Ø±Ù‡ÙŠØ²ÙŠØ¯">
 <!ENTITY torbutton.prefs.spoofreresh "ØªØ§Ø²Ù‡ Ú©Ø±Ø¯Ù† Ù‡ÙˆÙŠØª Ø¬Ø¹Ù„ÛŒ">
 <!ENTITY torbutton.prefs.refereroptions "ØªÙ†Ø¸ÙŠÙ…Ø§Øª Ø¬Ø¹Ù„ Ù‡ÙˆÙŠØª Ø§Ø±Ø¬Ø§Ø¹ Ø¯Ù‡Ù†Ø¯Ù‡">
-<!ENTITY torbutton.prefs.nospoof "Ø¹Ø¯Ù… Ø¬Ø¹Ù„ Ù‡ÙˆÙŠØª Ø§Ø±Ø¬Ø§Ø¹ Ø¯Ù‡Ù†Ø¯Ù‡">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.spoofroot "Ø¬Ø¹Ù„ Ù‡ÙˆÙŠØª Ù¾ÙˆØ´Ù‡ ØØ§ÙˆÛŒ ØµÙØÙ‡">
 <!ENTITY torbutton.prefs.spoofdomain "Ø¬Ø¹Ù„ Ù‡ÙˆÙŠØª Ø¯Ø§Ù…Ù†Ù‡ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† Ø§Ø±Ø¬Ø§Ø¹ Ø¯Ù‡Ù†Ø¯Ù‡">
-<!ENTITY torbutton.prefs.spoofblank "Ø¨ÛŒâ€ŒÙ†Ø§Ù… Ø³Ø§Ø²ÛŒ Ø§Ø±Ø¬Ø§Ø¹ Ø¯Ù‡Ù†Ø¯Ù‡">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "Ù…Ø¯ÙŠØ±ÙŠØª ØÙØ§Ø¸Øª Ú©Ù„ÙˆÚ†Ú©â€ŒÙ‡Ø§">
 <!ENTITY torbutton.cookiedialog.lockCol "ØÙØ§Ø¸Øª Ø´Ø¯Ù‡">
 <!ENTITY torbutton.cookiedialog.domainCol "Ù…ÙŠØ²Ø¨Ø§Ù†">
@@ -131,7 +131,7 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "ØØ°Ù ØªÙ…Ø§Ù… Ú©Ù„ÙˆÚ†Ú©â€ŒÙ‡Ø§ÛŒ ØÙØ§Ø¸Øª Ù†Ø´Ø¯Ù‡">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ØÙØ§Ø¸Øª Ø§Ø² Ú©Ù„ÙˆÚ†Ú©â€ŒÙ‡Ø§ÛŒ Ø¬Ø¯ÙŠØ¯">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ø¹Ø¯Ù… ØÙØ§Ø¸Øª Ø§Ø² Ú©Ù„ÙˆÚ†Ú©â€ŒÙ‡Ø§ÛŒ Ø¬Ø¯ÙŠØ¯">
-<!ENTITY torbutton.prefs.disable_livemarks "ØºÙŠØ±ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† Ø¨Ù‡â€ŒØ±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ Ø¨ÙˆÚ© Ù…Ø§Ø±Ú©â€ŒÙ‡Ø§ (livemarks) ØÙŠÙ† Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² ØªÙØ±">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(ØªÙˆØµÙŠÙ‡ Ù…ÛŒ Ø´ÙˆØ¯)">
 <!ENTITY torbutton.prefs.dtd_optional "(Ø§Ø®ØªÙŠØ§Ø±ÛŒ)">
 <!ENTITY torbutton.prefs.dtd_crucial "(Ø¨Ø³ÙŠØ§Ø± Ù…Ù‡Ù…)">
diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd
index 2fc51c6..8327507 100644
--- a/src/chrome/locale/fr/aboutTor.dtd
+++ b/src/chrome/locale/fr/aboutTor.dtd
@@ -4,37 +4,46 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "A propos de 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 "CEPENDANT, ce navigateur n'est pas Ã  jour.">
+<!ENTITY aboutTor.outOfDateTorOff.label "DE PLUS, ce navigateur n'est pas Ã  jour.">
+<!ENTITY aboutTor.outOfDate2.label "Cliquez sur l'oignon, puis choisissez TÃ©lÃ©charger les mises Ã  jour du Tor Browser Bundle.">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.check.label "Tester les paramÃ¨tres du rÃ©seau 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 at rt.torproject.org">
+<!ENTITY aboutTor.success.label "FÃ©licitationsÂ !">
+<!ENTITY aboutTor.success2.label "Ce navigateur est configurÃ© pour utiliser Tor.">
+<!ENTITY aboutTor.success3.label "Vous pouvez maintenant naviguer sur Internet de maniÃ¨re anonyme.">
+<!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 obtenir de l'aide, veuillez contacter">
+<!ENTITY aboutTor.failure3Link "help-fr at rt.torproject.org">
 <!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
+<!ENTITY aboutTor.search.label "Rechercher">
+
+<!-- Note to translators: the following 18 entities are used to construct a
+   - sentence (either the SP or DDG entities are used, but not both at the
+   - same time).   In English, the sentence reads:
+   -    Search securely with Startpage.
+   - or:
+   -    Search securely with DuckDuckGo.
+   - The sentence contains two embedded links for "securely" and
+   - the search engine ("Startpage" or "DuckDuckGo").
+  -->
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Rechercher">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Rechercher">
+<!ENTITY aboutTor.searchSP.privacy.label "en toute sÃ©curitÃ©">
+<!ENTITY aboutTor.searchDDG.privacy.label "en toute sÃ©curitÃ©">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html">
 <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "avec">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "avec">
 <!ENTITY aboutTor.searchSP.search.label "Startpage">
 <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
 <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
@@ -42,23 +51,23 @@
 <!ENTITY aboutTor.searchSP.search.afterLink.label ".">
 <!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country & 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.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.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en">
-<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en">
+<!ENTITY aboutTor.torInfo1.label "Informations supplÃ©mentairesÂ :">
+<!ENTITY aboutTor.torInfo2.label "Pays & adresse IPÂ :">
+<!ENTITY aboutTor.torInfo3.label "NÅ“ud de sortieÂ :">
+<!ENTITY aboutTor.torInfo4.label "Ce serveur n'enregistre aucune information sur les visites qu'il reÃ§oit.">
+<!ENTITY aboutTor.whatnextQuestion.label "Que faire ensuiteÂ ?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor n'est PAS tout ce dont vous avez besoin pour assurer votre anonymat ! Vous devrez 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.helpInfo1.label "Vous pouvez aider !">
+<!ENTITY aboutTor.helpInfo2.label "Vous pouvez aider Ã  rendre le rÃ©seau Tor plus rapide et plus puissant de plusieurs maniÃ¨res :">
+<!ENTITY aboutTor.helpInfo3.label "Faire fonctionner un relai Tor Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html">
+<!ENTITY aboutTor.helpInfo4.label "Devenir bÃ©nÃ©vole Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html">
+<!ENTITY aboutTor.helpInfo5.label "Faire un don Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html">
 
-<!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.learnMore.link "https://www.torproject.org/about/overview.html.en">
+<!ENTITY aboutTor.footer.label "Le projet Tor est une organisation Ã  but non lucratif (US 501(c)(3) dÃ©diÃ©e Ã  la recherche, le dÃ©veloppement et l'Ã©ducation sur l'anonymat et la vie privÃ©e en ligne.">
+<!ENTITY aboutTor.learnMore.label "En savoir plus sur le projet Tor Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html">
diff --git a/src/chrome/locale/fr/brand.dtd b/src/chrome/locale/fr/brand.dtd
index 76e405d..775472a 100644
--- a/src/chrome/locale/fr/brand.dtd
+++ b/src/chrome/locale/fr/brand.dtd
@@ -2,7 +2,7 @@
    - 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        "TorBrowser">
-<!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  brandShortName        "Navigateur Tor">
+<!ENTITY  brandFullName         "Navigateur Tor">
+<!ENTITY  vendorShortName       "Projet Tor">
+<!ENTITY  trademarkInfo.part1   "Firefox et les logos de Firefox sont des marques dÃ©posÃ©es de la Fondation Mozilla.">
diff --git a/src/chrome/locale/fr/brand.properties b/src/chrome/locale/fr/brand.properties
index 9ae168e..34bbdf9 100644
--- a/src/chrome/locale/fr/brand.properties
+++ b/src/chrome/locale/fr/brand.properties
@@ -2,14 +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/.
 
-brandShortName=TorBrowser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+brandShortName=Navigateur Tor
+brandFullName=Navigateur Tor
+vendorShortName=Projet Tor
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Firefox Start, une page d'accueil rapide avec recherche intÃ©grÃ©e
+homePageImport=Importez votre page d'accueil Ã  partir de %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=SÃ©lection de la Page d'accueil 
+homePageMigrationDescription=S'il vous plaÃ®t sÃ©lectionner la page d'accueil que vous souhaitez utiliser:
 
 syncBrandShortName=Sync
diff --git a/src/chrome/locale/fr/browser.properties b/src/chrome/locale/fr/browser.properties
index 295a03a..e8c588c 100644
--- a/src/chrome/locale/fr/browser.properties
+++ b/src/chrome/locale/fr/browser.properties
@@ -2,12 +2,12 @@
 browser.startup.homepage=about:tor
 
 # Spell checker dictionary
-spellchecker.dictionary=en_US
+spellchecker.dictionary=fr_FR
 
 # Default search engine
-browser.search.defaultenginename=Startpage
+browser.search.defaultenginename=Page d'accueil
 
 # Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Startpage
+browser.search.order.1=Page d'accueil
 browser.search.order.2=DuckDuckGo
 browser.search.order.3=Google
diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd
index 0d1c138..a537fba 100644
--- a/src/chrome/locale/fr/torbutton.dtd
+++ b/src/chrome/locale/fr/torbutton.dtd
@@ -116,10 +116,10 @@
 <!ENTITY torbutton.prefs.no_proxy_warning "Attention: Ã‰vitez d'utiliser les noms d'hÃ´tes ci-dessus">
 <!ENTITY torbutton.prefs.spoofreresh "Actualiser l'altÃ©ration">
 <!ENTITY torbutton.prefs.refereroptions "Options d'altÃ©ration de l'adresse rÃ©fÃ©rente">
-<!ENTITY torbutton.prefs.nospoof "Ne pas altÃ©rer l'adresse rÃ©fÃ©rente">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.spoofroot "AltÃ©rer le dossier contenant la page">
 <!ENTITY torbutton.prefs.spoofdomain "Utiliser le domaine comme adresse rÃ©fÃ©rente">
-<!ENTITY torbutton.prefs.spoofblank "Supprimer l'adresse rÃ©fÃ©rente">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "GÃ©rer les protections de cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "ProtÃ©gÃ©">
 <!ENTITY torbutton.cookiedialog.domainCol "HÃ´te">
@@ -131,7 +131,7 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Supprimer tous les cookies non protÃ©gÃ©s">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ProtÃ©ger les nouveaux cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne pas protÃ©ger les nouveaux cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "DÃ©sactiver les marques-pages dynamiques durant l'utilisation de Tor">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommandÃ©)">
 <!ENTITY torbutton.prefs.dtd_optional "(optionnel)">
 <!ENTITY torbutton.prefs.dtd_crucial "(essentiel)">
diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties
index 60cc74c..2b24b73 100644
--- a/src/chrome/locale/fr/torbutton.properties
+++ b/src/chrome/locale/fr/torbutton.properties
@@ -36,10 +36,10 @@ torbutton.popup.redirect = Rediriger
 torbutton.popup.no_redirect = Ne pas rediriger
 torbutton.popup.prompted_language = Pour renforcer votre anonymat, Torbutton peut demander une version anglaise de la page Web. Les pages que vous prÃ©fÃ©rez lire dans votre langue prÃ©fÃ©rÃ©e pourraient alors s'afficher en anglais.âŽ\nâŽ\nVoulez-vous demander des pages Web en anglais pour amÃ©liorer votre anonymat ?
 torbutton.popup.no_newnym = Torbutton ne peut pas dÃ©livrer une nouvelle identitÃ© de maniÃ¨re sÃ©curitaire. Il n'a pas accÃ¨s au port de contrÃ´le de Tor.\n\nUtilisez-vous le paquet du Navigateur Tor ?
-torbutton.popup.use_tbb = Il semble que vous utilisez Torbutton avec Firefox, ce qui n'est plus une configuration sÃ©curitaire recommandÃ©e.\n\nEn remplacement, nous vous recommandons d'obtenir le dernier paquet du Navigateur Tor en envoyant un courriel Ã  gettor at torproject.org ou en le tÃ©lÃ©chargeant depuis l'adresse URL suivante : 
+torbutton.popup.use_tbb = Il semble que vous utilisez Torbutton avec Firefox, ce qui n'est plus une configuration sÃ©curitaire recommandÃ©e.\n\nEn remplacement, nous vous recommandons d'obtenir le dernier paquet du Navigateur Tor en envoyant un courriel Ã  gettor at torproject.org ou en le tÃ©lÃ©chargeant depuis l'adresse URL suivante :
 torbutton.popup.pref_error = Torbutton ne peut pas mettre Ã  jour les prÃ©fÃ©rences dans le rÃ©pertoire du profil du Navigateur Tor.
 torbutton.popup.permission_denied = Merci de rÃ©initialiser les permissions du rÃ©pertoire du Navigateur Tor  ou de le copier dans un nouvel emplacement.
-torbutton.popup.device_full = Le disque semble Ãªtre plein. Merci de libÃ©rer de la place ou dÃ©placer le Navigateur Tor vers un nouveau pÃ©riphÃ©rique. 
+torbutton.popup.device_full = Le disque semble Ãªtre plein. Merci de libÃ©rer de la place ou dÃ©placer le Navigateur Tor vers un nouveau pÃ©riphÃ©rique.
 torbutton.title.prompt_torbrowser = Information importante concernant Torbutton
 torbutton.popup.prompt_torbrowser = Torbutton fonctionne diffÃ©remment maintenant: vous ne pouvez plus le dÃ©sactiver.\n\nNous avons effectuÃ© ce changement car il n'est pas sÃ»r d'utiliser Torbutton dans un navigateur qui est Ã©galement utiliser pour une navigation sans Tor. Ils y avaient trop de bugs ne nous pouvions rÃ©soudre.\n\nSi vous dÃ©sirez vous servir de Firefox normalement, vous devriez dÃ©installer le Torbutton et tÃ©lÃ©charger Tor Browsser Bundle. Les propriÃ©tÃ©s de confidentialitÃ© de Tor Browser sont supÃ©rieures Ã  celles de Firefox, mÃªme s'il est utilisÃ© avec TorButton.\n\nPour supprimer Torbutton, allez dans Outils->Modules ComplÃ©mentaires->Extensions et cliquez le button Supprimer Ã  cotÃ© de Torbutton.
 torbutton.popup.short_torbrowser = Information importante concernant Torbutton!\n\nTorbutton est dorÃ©navant toujours activÃ©.\n\nCliquer sur Torbutton pour plus d'informations.
diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd
index 2fc51c6..57b1a42 100644
--- a/src/chrome/locale/it/aboutTor.dtd
+++ b/src/chrome/locale/it/aboutTor.dtd
@@ -4,37 +4,46 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Info su 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 "TUTTAVIA, questo browser non Ã¨ aggiornato.">
+<!ENTITY aboutTor.outOfDateTorOff.label "INOLTRE, questo browser non Ã¨ aggiornato.">
+<!ENTITY aboutTor.outOfDate2.label "Clicca sulla cipolla e poi scegli Scarica Aggiornamento Tor Browser Bundle.">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.check.label "Test Impostazioni della Rete 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.success.label "Congratulazioni!">
+<!ENTITY aboutTor.success2.label "Questo browser Ã¨ configurato per usare Tor.">
+<!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 at rt.torproject.org">
 <!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
+<!ENTITY aboutTor.search.label "Cerca">
+
+<!-- Note to translators: the following 18 entities are used to construct a
+   - sentence (either the SP or DDG entities are used, but not both at the
+   - same time).   In English, the sentence reads:
+   -    Search securely with Startpage.
+   - or:
+   -    Search securely with DuckDuckGo.
+   - The sentence contains two embedded links for "securely" and
+   - the search engine ("Startpage" or "DuckDuckGo").
+  -->
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Cerca">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Cerca">
+<!ENTITY aboutTor.searchSP.privacy.label "in modo sicuro">
+<!ENTITY aboutTor.searchDDG.privacy.label "in modo sicuro">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/ita/protect-privacy.html">
 <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "con">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "con">
 <!ENTITY aboutTor.searchSP.search.label "Startpage">
 <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
 <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
@@ -42,23 +51,23 @@
 <!ENTITY aboutTor.searchSP.search.afterLink.label ".">
 <!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country & 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 "Ulteriori Info:">
+<!ENTITY aboutTor.torInfo2.label "Nazione & Indirizzo IP:">
+<!ENTITY aboutTor.torInfo3.label "Nodo di Uscita:">
+<!ENTITY aboutTor.torInfo4.label "Questo server non registra alcuna informazione circa i visitatori.">
+<!ENTITY aboutTor.whatnextQuestion.label "E Dopo?">
+<!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.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.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 Â»">
 <!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 "Aiutaci in Vari Modi Â»">
 <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.label "Fai una Donazione Â»">
 <!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 "Il Tor Project Ã¨ un'organizzazione 501(c)(3) non-profit americana dedicata alla ricerca, sviluppo ed educazione sull'anonimato e privacy online.">
+<!ENTITY aboutTor.learnMore.label "Maggiori info sul Tor Project Â»">
 <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">
diff --git a/src/chrome/locale/it/brand.dtd b/src/chrome/locale/it/brand.dtd
index 76e405d..b8f6fe9 100644
--- a/src/chrome/locale/it/brand.dtd
+++ b/src/chrome/locale/it/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "TorBrowser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "Firefox e i loghi Firefox sono marchi registrati della Mozilla Foundation.">
diff --git a/src/chrome/locale/it/brand.properties b/src/chrome/locale/it/brand.properties
index 9ae168e..ee1a15f 100644
--- a/src/chrome/locale/it/brand.properties
+++ b/src/chrome/locale/it/brand.properties
@@ -6,10 +6,10 @@ brandShortName=TorBrowser
 brandFullName=Tor Browser
 vendorShortName=Tor Project
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Firefox Start, una home page veloce con ricerca integrata
+homePageImport=Importa la tua home page da %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=Selezione Home Page
+homePageMigrationDescription=Seleziona la home page che desideri usare:
 
 syncBrandShortName=Sync
diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd
index 0de2f16..0372363 100644
--- a/src/chrome/locale/it/torbutton.dtd
+++ b/src/chrome/locale/it/torbutton.dtd
@@ -116,10 +116,10 @@
 <!ENTITY torbutton.prefs.no_proxy_warning "Attenzione: Evitare di usare uno degli hostnames di cui sopra">
 <!ENTITY torbutton.prefs.spoofreresh "Offusca gli aggiornamenti">
 <!ENTITY torbutton.prefs.refereroptions "Opzioni di offuscamento dei Referer">
-<!ENTITY torbutton.prefs.nospoof "Non offuscare i referer">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.spoofroot "Offusca la cartella contenente la pagina">
 <!ENTITY torbutton.prefs.spoofdomain "Offusca il dominio come referer">
-<!ENTITY torbutton.prefs.spoofblank "Rendi vuoto il referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "Gestisci protezione Cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protetto">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -131,7 +131,7 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Rimuovi tutti tranne quelli protetti">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteggi i nuovi cookie">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Non proteggere i nuovi cookie">
-<!ENTITY torbutton.prefs.disable_livemarks "Disabilita gli aggiornamenti dei livemarks durante l'uso di Tor">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(consigliato)">
 <!ENTITY torbutton.prefs.dtd_optional "(facoltativo)">
 <!ENTITY torbutton.prefs.dtd_crucial "(essenziale)">
diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd
index 2fc51c6..008a804 100644
--- a/src/chrome/locale/ko/aboutTor.dtd
+++ b/src/chrome/locale/ko/aboutTor.dtd
@@ -4,61 +4,70 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "">
 
-<!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 "">
+<!ENTITY aboutTor.outOfDateTorOff.label "">
+<!ENTITY aboutTor.outOfDate2.label "">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.check.label "">
 
-<!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 at rt.torproject.org">
-<!ENTITY aboutTor.failure3suffix.label ".">
+<!ENTITY aboutTor.success.label "">
+<!ENTITY aboutTor.success2.label "">
+<!ENTITY aboutTor.success3.label "">
+<!ENTITY aboutTor.failure.label "">
+<!ENTITY aboutTor.failure2.label "">
+<!ENTITY aboutTor.failure3prefix.label "">
+<!ENTITY aboutTor.failure3Link "">
+<!ENTITY aboutTor.failure3suffix.label " ">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
-<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
+<!ENTITY aboutTor.search.label "ê²€ìƒ‰">
+
+<!-- Note to translators: the following 18 entities are used to construct a
+   - sentence (either the SP or DDG entities are used, but not both at the
+   - same time).   In English, the sentence reads:
+   -    Search securely with Startpage.
+   - or:
+   -    Search securely with DuckDuckGo.
+   - The sentence contains two embedded links for "securely" and
+   - the search engine ("Startpage" or "DuckDuckGo").
+  -->
+<!ENTITY aboutTor.searchSPPost.link "">
+<!ENTITY aboutTor.searchDDGPost.link "">
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
+<!ENTITY aboutTor.searchSP.privacy.label "">
+<!ENTITY aboutTor.searchDDG.privacy.label "">
+<!ENTITY aboutTor.searchSP.privacy.link "">
+<!ENTITY aboutTor.searchDDG.privacy.link "">
 <!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
 <!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
+<!ENTITY aboutTor.searchSP.search.label "">
+<!ENTITY aboutTor.searchDDG.search.label "">
+<!ENTITY aboutTor.searchSP.search.link "">
+<!ENTITY aboutTor.searchDDG.search.link "">
+<!ENTITY aboutTor.searchSP.search.afterLink.label " ">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label " ">
 
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
-
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country & 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.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.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en">
-<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en">
+<!ENTITY aboutTor.torInfo1.label "">
+<!ENTITY aboutTor.torInfo2.label "">
+<!ENTITY aboutTor.torInfo3.label "">
+<!ENTITY aboutTor.torInfo4.label "">
+<!ENTITY aboutTor.whatnextQuestion.label "">
+<!ENTITY aboutTor.whatnextAnswer.label "">
+<!ENTITY aboutTor.whatnext.label "">
+<!ENTITY aboutTor.whatnext.link "">
+<!ENTITY aboutTor.helpInfo1.label "">
+<!ENTITY aboutTor.helpInfo2.label "">
+<!ENTITY aboutTor.helpInfo3.label "">
+<!ENTITY aboutTor.helpInfo3.link "">
+<!ENTITY aboutTor.helpInfo4.label "">
+<!ENTITY aboutTor.helpInfo4.link "">
+<!ENTITY aboutTor.helpInfo5.label "">
+<!ENTITY aboutTor.helpInfo5.link "">
 
-<!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.learnMore.link "https://www.torproject.org/about/overview.html.en">
+<!ENTITY aboutTor.footer.label "">
+<!ENTITY aboutTor.learnMore.label "">
+<!ENTITY aboutTor.learnMore.link "">
diff --git a/src/chrome/locale/ko/brand.dtd b/src/chrome/locale/ko/brand.dtd
index 76e405d..e34f480 100644
--- a/src/chrome/locale/ko/brand.dtd
+++ b/src/chrome/locale/ko/brand.dtd
@@ -2,7 +2,7 @@
    - 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        "TorBrowser">
-<!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  brandShortName        "">
+<!ENTITY  brandFullName         "">
+<!ENTITY  vendorShortName       "">
+<!ENTITY  trademarkInfo.part1   "">
diff --git a/src/chrome/locale/ko/brand.properties b/src/chrome/locale/ko/brand.properties
index 9ae168e..6598ccd 100644
--- a/src/chrome/locale/ko/brand.properties
+++ b/src/chrome/locale/ko/brand.properties
@@ -2,14 +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/.
 
-brandShortName=TorBrowser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+# brandShortName=TorBrowser
+# brandFullName=Tor Browser
+# vendorShortName=Tor Project
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+# homePageSingleStartMain=Firefox Start, a fast home page with built-in search
+# homePageImport=Import your home page from %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+# homePageMigrationPageTitle=Home Page Selection
+# homePageMigrationDescription=Please select the home page you wish to use:
 
-syncBrandShortName=Sync
+# syncBrandShortName=Sync
diff --git a/src/chrome/locale/ko/browser.properties b/src/chrome/locale/ko/browser.properties
index 295a03a..fd25b10 100644
--- a/src/chrome/locale/ko/browser.properties
+++ b/src/chrome/locale/ko/browser.properties
@@ -1,13 +1,13 @@
 # Default home page
-browser.startup.homepage=about:tor
+# browser.startup.homepage=about:tor
 
 # Spell checker dictionary
-spellchecker.dictionary=en_US
+# spellchecker.dictionary=en_US
 
 # Default search engine
-browser.search.defaultenginename=Startpage
+# browser.search.defaultenginename=Startpage
 
 # Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Startpage
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
+# browser.search.order.1=Startpage
+# browser.search.order.2=DuckDuckGo
+# browser.search.order.3=Google
diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd
index e501e73..b9f6feb 100644
--- a/src/chrome/locale/ko/torbutton.dtd
+++ b/src/chrome/locale/ko/torbutton.dtd
@@ -116,10 +116,10 @@
 <!ENTITY torbutton.prefs.no_proxy_warning "ì£¼ì˜ : ì–´ë–¤ í˜¸ìŠ¤íŠ¸ë„¤ìž„ì„ ì•„ëž˜ì—ì„œ ì‚¬ìš©í•˜ëŠ” ê²ƒì„ í”¼í•˜ì‹ì‹œì˜¤.">
 <!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
 <!ENTITY torbutton.prefs.refereroptions "Referer Spoofing ì˜µì…˜">
-<!ENTITY torbutton.prefs.nospoof "ë¦¬í¼ëŸ¬ë¥¼ spoof í•˜ì§€ ë§ˆì‹ì‹œì˜¤">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.spoofroot "íŽ˜ì´ì§€ í´ë”ë¥¼ í¬í•¨í•˜ëŠ” spoof">
 <!ENTITY torbutton.prefs.spoofdomain "ë„ì—ë¯¼ì„ ë¦¬í¼ëŸ¬ë¡œ spoof í•˜ì‹ì‹œì˜¤">
-<!ENTITY torbutton.prefs.spoofblank "refererë¥¼ ê³µëž€ìœ¼ë¡œ ë§Œë“¤ê¸°">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "ì¿ í‚¤ ë³´í˜¸ ê´€ë¦¬">
 <!ENTITY torbutton.cookiedialog.lockCol "ë³´í˜¸ë¨">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -131,7 +131,7 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "ë³´í˜¸ëœ ê²ƒ ë¹¼ê³  ëª¨ë‘ ì§€ìš°ê¸°">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ìƒˆë¡œìš´ ì¿ í‚¤ ë³´í˜¸">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ìƒˆë¡œìš´ ì¿ í‚¤ë¥¼ ë³´í˜¸í•˜ì§€ ì•ŠìŒ">
-<!ENTITY torbutton.prefs.disable_livemarks "Tor toggle ë™ì•ˆ Livemark ì—…ë°ì´íŠ¸ ë¹„í™œì„±í™”">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(ì¶”ì²œ)">
 <!ENTITY torbutton.prefs.dtd_optional "(ì„ íƒ)">
 <!ENTITY torbutton.prefs.dtd_crucial "(ì¤‘ìš”)">
diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties
index a53d9b7..f3fa432 100644
--- a/src/chrome/locale/ko/torbutton.properties
+++ b/src/chrome/locale/ko/torbutton.properties
@@ -36,7 +36,7 @@ torbutton.popup.redirect = ë¦¬ë‹¤ì´ë ‰íŠ¸
 torbutton.popup.no_redirect = ë¦¬ë‹¤ì´ë ‰íŠ¸ í•˜ì§€ ì•ŠìŒ
 torbutton.popup.prompted_language = ë” ë§Žì€ ê°œì¸ ì •ë³´ë¥¼ ìœ„í•´, Torbuttonì€ ì˜ì–´ ë²„ì „ ì›¹íŽ˜ì´ì§€ë¥¼ ìš”ì²í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤. ì´ê²ƒì€ ê·€í•˜ì˜ ëª¨êµì–´ ëŒ€ì‹  ì˜ì–´ë¥¼ í‘œì‹œí•˜ëŠ” ì›¹ íŽ˜ì´ì§€ë¥¼ ì¼ìœ¼í‚¬ ìˆ˜ ìžˆìŠµë‹ˆë‹¤.\n\në” ë‚˜ì€ ê°œì¸ ì •ë³´ë¥¼ ìœ„í•´ ì˜ì–´ ì›¹ íŽ˜ì´ì§€ë¥¼ ìš”ì²í•˜ì‹œê² ìŠµë‹ˆê¹Œ?
 torbutton.popup.no_newnym = Torbuttonì€ ì•ˆì „í•˜ê²Œ ìƒˆë¡œìš´ ì‹ ì›ì„ ì¤„ ìˆ˜ ì—†ìŠµë‹ˆë‹¤. ì´ê²ƒì€ Tor ì»¨íŠ¸ë¡¤ í¬íŠ¸ì— ì ‘ê·¼í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤.\n\nTor Browser Bundleì„ ì‚¬ìš©í•˜ê³  ê³„ì‹ë‹ˆê¹Œ?
-torbutton.popup.use_tbb = ì´ê²ƒì€ Torbuttonì„ íŒŒì´ì–´íìŠ¤ì™€ í•¨ê»˜ ì‚¬ìš©í•˜ì‹¤ ë•Œ ë‚˜íƒ€ë‚©ë‹ˆë‹¤. ê·¸ë¦¬ê³  ë©ìƒ ì¶”ì²œë˜ëŠ” ì•ˆì „ ì„¤ì •ì´ ì•„ë‹™ë‹ˆë‹¤.\n\nëŒ€ì‹ , ì €í¬ëŠ” gettor at torproject.org ì—ê²Œ ë©”ì¼ì„ ë³´ë‚´ê±°ë‚˜, ë‹¤ìŒ URLì— ì ‘ì†í•´ì„œ ìµœì‹  Tor browser bundleì„ ë°›ëŠ” ê²ƒì„ ì¶”ì²œë“œë¦½ë‹ˆë‹¤: 
+torbutton.popup.use_tbb = ì´ê²ƒì€ Torbuttonì„ íŒŒì´ì–´íìŠ¤ì™€ í•¨ê»˜ ì‚¬ìš©í•˜ì‹¤ ë•Œ ë‚˜íƒ€ë‚©ë‹ˆë‹¤. ê·¸ë¦¬ê³  ë©ìƒ ì¶”ì²œë˜ëŠ” ì•ˆì „ ì„¤ì •ì´ ì•„ë‹™ë‹ˆë‹¤.\n\nëŒ€ì‹ , ì €í¬ëŠ” gettor at torproject.org ì—ê²Œ ë©”ì¼ì„ ë³´ë‚´ê±°ë‚˜, ë‹¤ìŒ URLì— ì ‘ì†í•´ì„œ ìµœì‹  Tor browser bundleì„ ë°›ëŠ” ê²ƒì„ ì¶”ì²œë“œë¦½ë‹ˆë‹¤:
 torbutton.popup.pref_error = Torbuttonì€ Tor Browser í”„ë¡œíŒŒì¼ ë””ë ‰í‡´ë¥¼ ì—…ë°ì´íŠ¸ í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤.
 torbutton.popup.permission_denied = Tor Browser ë””ë ‰í† ë¦¬ì˜ ê¶Œí™˜ì„ ì´ˆê¸°í™” í•˜ì‹œê±°ë‚˜,  Tor browserë¥¼ ìƒˆë¡œìš´ ìœ„ì¹˜ë¡œ ì˜®ê²¨ ì£¼ì‹ì‹œì˜¤.
 torbutton.popup.device_full = ì´ ë””ìŠ¤í¬ëŠ” ê°€ë“ ì°¬ ê²ƒ ê°™ìŠµë‹ˆë‹¤. ë¹ˆ ê³µê°„ì„ ë§Œë“œì‹œê±°ë‚˜ ìƒˆë¡œìš´ ìž¥ì¹˜ë¡œ Tor browserë¥¼ ì˜®ê²¨ ì£¼ì‹ì‹œì˜¤.
diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd
index 2fc51c6..fd73f07 100644
--- a/src/chrome/locale/nl/aboutTor.dtd
+++ b/src/chrome/locale/nl/aboutTor.dtd
@@ -4,61 +4,70 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Over 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 "ECHTER, deze browser is verouderd.">
+<!ENTITY aboutTor.outOfDateTorOff.label "BOVENDIEN is deze browser verouderd.">
+<!ENTITY aboutTor.outOfDate2.label "Click op de ui en kies Download Tor Browser Pakket Update.">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.check.label "Test Tor Netwerk Instellingen">
 
-<!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.success.label "Gefeliciteerd!">
+<!ENTITY aboutTor.success2.label "Deze browser is ingesteld om Tor te gebruiken.">
+<!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 "Voor hulp, contacteer">
 <!ENTITY aboutTor.failure3Link "help at rt.torproject.org">
 <!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
+<!ENTITY aboutTor.search.label "Zoeken">
+
+<!-- Note to translators: the following 18 entities are used to construct a
+   - sentence (either the SP or DDG entities are used, but not both at the
+   - same time).   In English, the sentence reads:
+   -    Search securely with Startpage.
+   - or:
+   -    Search securely with DuckDuckGo.
+   - The sentence contains two embedded links for "securely" and
+   - the search engine ("Startpage" or "DuckDuckGo").
+  -->
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Zoeken">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Zoeken">
+<!ENTITY aboutTor.searchSP.privacy.label "veilig">
+<!ENTITY aboutTor.searchDDG.privacy.label "veilig">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/ned/protect-privacy.html">
 <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "met">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "met">
 <!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
+<!ENTITY aboutTor.searchDDG.search.label "Startpage">
 <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
 <!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
 <!ENTITY aboutTor.searchSP.search.afterLink.label ".">
 <!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
+<!ENTITY aboutTor.torInfo1.label "Bijkomende informatie:">
+<!ENTITY aboutTor.torInfo2.label "Land & IP Adres:">
 <!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.torInfo4.label "Deze server logt geen enkele informatie over bezoekers.">
+<!ENTITY aboutTor.whatnextQuestion.label "Wat nu?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NIET alles wat u nodig heeft om anoniem te kunnen browsen. Mogelijk is het nodig dat u bepaalde browsing-gewoontes veranderen om te vezekeren dat uw 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.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.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 Relay Node Â»">
 <!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 "Wordt vrijwilliger">
 <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.label "Doe een donatie Â»">
 <!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 "Het Tor Project is een US 501(c)(3) non-profit voor onderzoek, ontwikkeling, onderwijs in online anonimiteit en privacy.">
+<!ENTITY aboutTor.learnMore.label "Leer meer over Het Tor  Project Â» ">
 <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">
diff --git a/src/chrome/locale/nl/brand.dtd b/src/chrome/locale/nl/brand.dtd
index 76e405d..111e9a9 100644
--- a/src/chrome/locale/nl/brand.dtd
+++ b/src/chrome/locale/nl/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "TorBrowser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "Firefox and het Firefox logo zijn handelsmerken van de Mozilla Foundation.">
diff --git a/src/chrome/locale/nl/brand.properties b/src/chrome/locale/nl/brand.properties
index 9ae168e..b03e3a7 100644
--- a/src/chrome/locale/nl/brand.properties
+++ b/src/chrome/locale/nl/brand.properties
@@ -6,10 +6,10 @@ brandShortName=TorBrowser
 brandFullName=Tor Browser
 vendorShortName=Tor Project
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Firefox Start, een snelle startpagina met ingebouwde zoekfunctie
+homePageImport=Importeer je startpagina uit %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=Startpagina selectie
+homePageMigrationDescription=Selecteer de startpagina die jij wil gebruiken:
 
 syncBrandShortName=Sync
diff --git a/src/chrome/locale/nl/browser.properties b/src/chrome/locale/nl/browser.properties
index 295a03a..8196ec1 100644
--- a/src/chrome/locale/nl/browser.properties
+++ b/src/chrome/locale/nl/browser.properties
@@ -9,5 +9,5 @@ browser.search.defaultenginename=Startpage
 
 # Search engine order (order displayed in the search bar dropdown)
 browser.search.order.1=Startpage
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
+browser.search.order.2=Startpage
+browser.search.order.3=Startpage
diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd
index a78a0de..9be6230 100644
--- a/src/chrome/locale/nl/torbutton.dtd
+++ b/src/chrome/locale/nl/torbutton.dtd
@@ -116,10 +116,10 @@
 <!ENTITY torbutton.prefs.no_proxy_warning "Opgelet: gebruik van bovenstaande hostnamen vermijden">
 <!ENTITY torbutton.prefs.spoofreresh "Spoof Vernieuwen">
 <!ENTITY torbutton.prefs.refereroptions "Verwijzer Spoof instellingen">
-<!ENTITY torbutton.prefs.nospoof "Spoof verwijzer niet">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.spoofroot "Spoof de bovenliggende folder van de pagina">
 <!ENTITY torbutton.prefs.spoofdomain "Spoof het domein als verwijzer">
-<!ENTITY torbutton.prefs.spoofblank "Maak verwijzer leeg">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "Beheer Cookie Beveiligingen">
 <!ENTITY torbutton.cookiedialog.lockCol "Beveiligd">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -131,7 +131,7 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Verwijder alle behalve beveiligde">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Beveilig nieuwe Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beveilig nieuwe Cookies niet">
-<!ENTITY torbutton.prefs.disable_livemarks "Livemark-updates tijdens Tor verhinderen">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(aanbevolen)">
 <!ENTITY torbutton.prefs.dtd_optional "(optioneel)">
 <!ENTITY torbutton.prefs.dtd_crucial "(cruciaal)">
diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd
index 2fc51c6..fe95c2d 100644
--- a/src/chrome/locale/pl/aboutTor.dtd
+++ b/src/chrome/locale/pl/aboutTor.dtd
@@ -4,61 +4,70 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Informacje">
 
-<!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 "jednak ta przeglÄ…darka jest nieaktualna.">
+<!ENTITY aboutTor.outOfDateTorOff.label "Ponadto ta przeglÄ…darka jest nieaktualna.">
+<!ENTITY aboutTor.outOfDate2.label "Kliknij na cebulÄ™, a nastÄ™pnie wybierz Pobierz aktualizacjÄ™ Tor Browser Bundle.">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.check.label "Przetestuj Ustawienia Sieci 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.success.label "Gratulacje!">
+<!ENTITY aboutTor.success2.label "Ta przeglÄ…darka jest skonfigurowana do korzystania z Tor.">
+<!ENTITY aboutTor.success3.label "JesteÅ› 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 at rt.torproject.org">
 <!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
+<!ENTITY aboutTor.search.label "Szukaj">
+
+<!-- Note to translators: the following 18 entities are used to construct a
+   - sentence (either the SP or DDG entities are used, but not both at the
+   - same time).   In English, the sentence reads:
+   -    Search securely with Startpage.
+   - or:
+   -    Search securely with DuckDuckGo.
+   - The sentence contains two embedded links for "securely" and
+   - the search engine ("Startpage" or "DuckDuckGo").
+  -->
+<!ENTITY aboutTor.searchSPPost.link "">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Szukaj">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Szukaj">
+<!ENTITY aboutTor.searchSP.privacy.label "bezpiecznie">
+<!ENTITY aboutTor.searchDDG.privacy.label "bezpiecznie">
+<!ENTITY aboutTor.searchSP.privacy.link "">
 <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
 <!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
 <!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
+<!ENTITY aboutTor.searchSP.search.label "Strona startowa">
 <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
 <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
 <!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
 <!ENTITY aboutTor.searchSP.search.afterLink.label ".">
 <!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country & 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 "Informatii suplimentare:">
+<!ENTITY aboutTor.torInfo2.label "Kraj i adres IP:">
+<!ENTITY aboutTor.torInfo3.label "WÄ™zÅ‚a WyjÅ›ciowe:">
+<!ENTITY aboutTor.torInfo4.label "Ten serwer nie rejestruje Å¼adnych informacji o odwiedzajÄ…cych.">
+<!ENTITY aboutTor.whatnextQuestion.label "Co dalej?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor NIE jest wszystko, czego potrzebujesz, aby przeglÄ…daÄ‡ anonimowo! MoÅ¼e trzeba bÄ™dzie zmieniÄ‡ niektÃ³re ustawienia, aby zapewniÄ‡ toÅ¼samoÅ›Ä‡ pozostaje bezpieczny.">
+<!ENTITY aboutTor.whatnext.label "Porady Na Temat Pobytu Anonimowy Â»">
 <!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.helpInfo1.label "Ty moÅ¼esz pomÃ³c!">
+<!ENTITY aboutTor.helpInfo2.label "Istnieje wiele sposobÃ³w, moÅ¼esz pomÃ³c uczyniÄ‡ sieÄ‡ Tora BÄ™dzie szybsza i silniejsza:">
+<!ENTITY aboutTor.helpInfo3.label "Uruchom WÄ™zeÅ‚ Tora PrzekaÅºnik Â»">
 <!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 "Wolontariat Swoje UsÅ‚ugi Â»">
 <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.label "PrzekaÅ¼ darowiznÄ™ Â»">
 <!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 "Projekt Tor jest US 501 (c) (3) non-profit, zajmujÄ…ca siÄ™ badaniami, rozwojem i edukacji online anonimowoÅ›ci i prywatnoÅ›ci.">
+<!ENTITY aboutTor.learnMore.label "Dowiedz siÄ™ wiÄ™cej na temat Tor Project Â»">
 <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">
diff --git a/src/chrome/locale/pl/brand.dtd b/src/chrome/locale/pl/brand.dtd
index 76e405d..e34f480 100644
--- a/src/chrome/locale/pl/brand.dtd
+++ b/src/chrome/locale/pl/brand.dtd
@@ -2,7 +2,7 @@
    - 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        "TorBrowser">
-<!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  brandShortName        "">
+<!ENTITY  brandFullName         "">
+<!ENTITY  vendorShortName       "">
+<!ENTITY  trademarkInfo.part1   "">
diff --git a/src/chrome/locale/pl/brand.properties b/src/chrome/locale/pl/brand.properties
index 9ae168e..6598ccd 100644
--- a/src/chrome/locale/pl/brand.properties
+++ b/src/chrome/locale/pl/brand.properties
@@ -2,14 +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/.
 
-brandShortName=TorBrowser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+# brandShortName=TorBrowser
+# brandFullName=Tor Browser
+# vendorShortName=Tor Project
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+# homePageSingleStartMain=Firefox Start, a fast home page with built-in search
+# homePageImport=Import your home page from %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+# homePageMigrationPageTitle=Home Page Selection
+# homePageMigrationDescription=Please select the home page you wish to use:
 
-syncBrandShortName=Sync
+# syncBrandShortName=Sync
diff --git a/src/chrome/locale/pl/browser.properties b/src/chrome/locale/pl/browser.properties
index 295a03a..f5df9f3 100644
--- a/src/chrome/locale/pl/browser.properties
+++ b/src/chrome/locale/pl/browser.properties
@@ -1,13 +1,13 @@
 # Default home page
-browser.startup.homepage=about:tor
+# browser.startup.homepage=about:tor
 
 # Spell checker dictionary
-spellchecker.dictionary=en_US
+# spellchecker.dictionary=en_US
 
 # Default search engine
-browser.search.defaultenginename=Startpage
+browser.search.defaultenginename=Strona startowa
 
 # Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Startpage
+browser.search.order.1=Strona startowa
 browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
+# browser.search.order.3=Google
diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd
index 6dc083c..bb88dbe 100644
--- a/src/chrome/locale/pl/torbutton.dtd
+++ b/src/chrome/locale/pl/torbutton.dtd
@@ -116,10 +116,10 @@
 <!ENTITY torbutton.prefs.no_proxy_warning "Uwaga: Unikaj podawania nazw hostÃ³w powyÅ¼ej">
 <!ENTITY torbutton.prefs.spoofreresh "FaÅ‚szuj odÅ›wieÅ¼anie">
 <!ENTITY torbutton.prefs.refereroptions "Opcje faÅ‚szowania adresu zwrotnego">
-<!ENTITY torbutton.prefs.nospoof "Nie faÅ‚szuj adresu zwrotnego">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.spoofroot "WysyÅ‚aj folder zawierajÄ…cy stronÄ™">
 <!ENTITY torbutton.prefs.spoofdomain "WysyÅ‚aj domenÄ™ jako adres zwrotny">
-<!ENTITY torbutton.prefs.spoofblank "WyczyÅ›Ä‡ adres zwrotny">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "ZarzÄ…dzaj ochronÄ… ciasteczek">
 <!ENTITY torbutton.cookiedialog.lockCol "Chronione">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -131,7 +131,7 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "UsuÅ„ wszystkie oprÃ³cz chronionych">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ChroÅ„ nowe ciasteczka">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nie chroÅ„ nowych ciasteczek">
-<!ENTITY torbutton.prefs.disable_livemarks "WyÅ‚Ä…cz aktualizacje livemarks podczas uÅ¼ywania Tora">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(zalecane)">
 <!ENTITY torbutton.prefs.dtd_optional "(opcjonalne)">
 <!ENTITY torbutton.prefs.dtd_crucial "(waÅ¼ne)">
diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties
index 85560a8..ddc1acb 100644
--- a/src/chrome/locale/pl/torbutton.properties
+++ b/src/chrome/locale/pl/torbutton.properties
@@ -36,7 +36,7 @@ torbutton.popup.redirect = Przekieruj
 torbutton.popup.no_redirect = Nie przekierowywuj
 torbutton.popup.prompted_language = Aby daÄ‡ Ci wiÄ™cej prywatnoÅ›ci, Torbutton moÅ¼e Å¼Ä…daÄ‡ angielskich wersji stron internetowych. To moÅ¼e spowodowaÄ‡, Å¼e strony, ktÃ³re wolisz czytaÄ‡ we wÅ‚asnym jÄ™zyku bÄ™dÄ… siÄ™ zamiast tego wyÅ›wietlaÄ‡ po angielsku.\n\nCzy chcesz Å¼Ä…daÄ‡ stron w jÄ™zyku angielskim dla lepszej prywatnoÅ›ci?
 torbutton.popup.no_newnym = Torbutton nie moÅ¼e bezpiecznie daÄ‡ Ci nowej toÅ¼samoÅ›ci. Nie ma dostÄ™pu do Portu Kontrolnego Tora.\n\nUzywasz Paczki Tora z PrzeglÄ…darkÄ…?
-torbutton.popup.use_tbb = WyglÄ…da na to, Å¼e uÅ¼ywasz Torbuttona z Firefoksem, co juÅ¼ nie jest zalecanÄ… bezpiecznÄ… konfiguracjÄ….\n\nZamiast tego, zalecamy pobranie najnowszej Paczki Tora z PrzeglÄ…darkÄ… poprzez wysÅ‚anie e-maila na gettor at torproject.org lub pobranie jej pod nastÄ™pujÄ…cym adresem: 
+torbutton.popup.use_tbb = WyglÄ…da na to, Å¼e uÅ¼ywasz Torbuttona z Firefoksem, co juÅ¼ nie jest zalecanÄ… bezpiecznÄ… konfiguracjÄ….\n\nZamiast tego, zalecamy pobranie najnowszej Paczki Tora z PrzeglÄ…darkÄ… poprzez wysÅ‚anie e-maila na gettor at torproject.org lub pobranie jej pod nastÄ™pujÄ…cym adresem:
 torbutton.popup.pref_error = Torbutton nie moÅ¼e zaktualizowaÄ‡ preferencji w katalogu profilowym PrzeglÄ…darki Tora.
 torbutton.popup.permission_denied = ProszÄ™ albo ponownie ustawiÄ‡ uprawnienia do katalogu PrzeglÄ…darki Tora albo skopiowaÄ‡ go w nowe miejsce.
 torbutton.popup.device_full = Dysk zdaje siÄ™ byÄ‡ peÅ‚ny. ProszÄ™ zwolniÄ‡ miejsce lub przenieÅ›Ä‡ PrzeglÄ…darkÄ™ Tora na nowe urzÄ…dzenie.
diff --git a/src/chrome/locale/pt/aboutTor.dtd b/src/chrome/locale/pt/aboutTor.dtd
index 2fc51c6..2ee9914 100644
--- a/src/chrome/locale/pt/aboutTor.dtd
+++ b/src/chrome/locale/pt/aboutTor.dtd
@@ -4,61 +4,70 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "">
 
-<!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 "">
+<!ENTITY aboutTor.outOfDateTorOff.label "">
+<!ENTITY aboutTor.outOfDate2.label "">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.check.label "">
 
-<!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 at rt.torproject.org">
+<!ENTITY aboutTor.success.label "">
+<!ENTITY aboutTor.success2.label "">
+<!ENTITY aboutTor.success3.label "">
+<!ENTITY aboutTor.failure.label "">
+<!ENTITY aboutTor.failure2.label "">
+<!ENTITY aboutTor.failure3prefix.label "">
+<!ENTITY aboutTor.failure3Link "">
 <!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
-<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
+<!ENTITY aboutTor.search.label "Procurar">
+
+<!-- Note to translators: the following 18 entities are used to construct a
+   - sentence (either the SP or DDG entities are used, but not both at the
+   - same time).   In English, the sentence reads:
+   -    Search securely with Startpage.
+   - or:
+   -    Search securely with DuckDuckGo.
+   - The sentence contains two embedded links for "securely" and
+   - the search engine ("Startpage" or "DuckDuckGo").
+  -->
+<!ENTITY aboutTor.searchSPPost.link "">
+<!ENTITY aboutTor.searchDDGPost.link "">
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
+<!ENTITY aboutTor.searchSP.privacy.label "">
+<!ENTITY aboutTor.searchDDG.privacy.label "">
+<!ENTITY aboutTor.searchSP.privacy.link "">
+<!ENTITY aboutTor.searchDDG.privacy.link "">
 <!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
 <!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
+<!ENTITY aboutTor.searchSP.search.label "">
+<!ENTITY aboutTor.searchDDG.search.label "">
+<!ENTITY aboutTor.searchSP.search.link "">
+<!ENTITY aboutTor.searchDDG.search.link "">
 <!ENTITY aboutTor.searchSP.search.afterLink.label ".">
 <!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country & 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.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.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en">
-<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en">
+<!ENTITY aboutTor.torInfo1.label "">
+<!ENTITY aboutTor.torInfo2.label "">
+<!ENTITY aboutTor.torInfo3.label "">
+<!ENTITY aboutTor.torInfo4.label "">
+<!ENTITY aboutTor.whatnextQuestion.label "">
+<!ENTITY aboutTor.whatnextAnswer.label "">
+<!ENTITY aboutTor.whatnext.label "">
+<!ENTITY aboutTor.whatnext.link "">
+<!ENTITY aboutTor.helpInfo1.label "">
+<!ENTITY aboutTor.helpInfo2.label "">
+<!ENTITY aboutTor.helpInfo3.label "">
+<!ENTITY aboutTor.helpInfo3.link "">
+<!ENTITY aboutTor.helpInfo4.label "">
+<!ENTITY aboutTor.helpInfo4.link "">
+<!ENTITY aboutTor.helpInfo5.label "">
+<!ENTITY aboutTor.helpInfo5.link "">
 
-<!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.learnMore.link "https://www.torproject.org/about/overview.html.en">
+<!ENTITY aboutTor.footer.label "">
+<!ENTITY aboutTor.learnMore.label "">
+<!ENTITY aboutTor.learnMore.link "">
diff --git a/src/chrome/locale/pt/brand.dtd b/src/chrome/locale/pt/brand.dtd
index 76e405d..e34f480 100644
--- a/src/chrome/locale/pt/brand.dtd
+++ b/src/chrome/locale/pt/brand.dtd
@@ -2,7 +2,7 @@
    - 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        "TorBrowser">
-<!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  brandShortName        "">
+<!ENTITY  brandFullName         "">
+<!ENTITY  vendorShortName       "">
+<!ENTITY  trademarkInfo.part1   "">
diff --git a/src/chrome/locale/pt/brand.properties b/src/chrome/locale/pt/brand.properties
index 9ae168e..6598ccd 100644
--- a/src/chrome/locale/pt/brand.properties
+++ b/src/chrome/locale/pt/brand.properties
@@ -2,14 +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/.
 
-brandShortName=TorBrowser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+# brandShortName=TorBrowser
+# brandFullName=Tor Browser
+# vendorShortName=Tor Project
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+# homePageSingleStartMain=Firefox Start, a fast home page with built-in search
+# homePageImport=Import your home page from %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+# homePageMigrationPageTitle=Home Page Selection
+# homePageMigrationDescription=Please select the home page you wish to use:
 
-syncBrandShortName=Sync
+# syncBrandShortName=Sync
diff --git a/src/chrome/locale/pt/browser.properties b/src/chrome/locale/pt/browser.properties
index 295a03a..fd25b10 100644
--- a/src/chrome/locale/pt/browser.properties
+++ b/src/chrome/locale/pt/browser.properties
@@ -1,13 +1,13 @@
 # Default home page
-browser.startup.homepage=about:tor
+# browser.startup.homepage=about:tor
 
 # Spell checker dictionary
-spellchecker.dictionary=en_US
+# spellchecker.dictionary=en_US
 
 # Default search engine
-browser.search.defaultenginename=Startpage
+# browser.search.defaultenginename=Startpage
 
 # Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Startpage
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
+# browser.search.order.1=Startpage
+# browser.search.order.2=DuckDuckGo
+# browser.search.order.3=Google
diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd
index ca8b8da..a030ec7 100644
--- a/src/chrome/locale/pt/torbutton.dtd
+++ b/src/chrome/locale/pt/torbutton.dtd
@@ -116,10 +116,10 @@
 <!ENTITY torbutton.prefs.no_proxy_warning "Evite utilizar o nome da mÃ¡quina no campo a cima">
 <!ENTITY torbutton.prefs.spoofreresh "Refrescamento da falsificaÃ§Ã£o">
 <!ENTITY torbutton.prefs.refereroptions "OpÃ§Ãµes de falsificaÃ§Ã£o do referente">
-<!ENTITY torbutton.prefs.nospoof "NÃ£o falsificar referente">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.spoofroot "Falsificar a pasta que contÃ©m a pÃ¡gina">
 <!ENTITY torbutton.prefs.spoofdomain "Falsificar o domÃnio com o referente">
-<!ENTITY torbutton.prefs.spoofblank "Limpar referente">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "Gerir as ProteÃ§Ãµes dos Cookies">
 <!ENTITY torbutton.cookiedialog.lockCol "Protegido">
 <!ENTITY torbutton.cookiedialog.domainCol "AnfitriÃ£o">
@@ -131,7 +131,7 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remover todos excepto os Protegidos">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger os novos Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NÃ£o proteger os novos Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "Desactivar actualizaÃ§Ãµes durante a utilizaÃ§Ã£o do Tor">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recomendado)">
 <!ENTITY torbutton.prefs.dtd_optional "(opcional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd
index 2fc51c6..0d53ea3 100644
--- a/src/chrome/locale/ru/aboutTor.dtd
+++ b/src/chrome/locale/ru/aboutTor.dtd
@@ -4,61 +4,71 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Ðž Ð¿Ñ€Ð¾ÐµÐºÑ‚Ðµ 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 "Ð¢Ð•Ðœ ÐÐ• ÐœÐ•ÐÐ•Ð•, Ð´Ð°Ð½Ð½Ñ‹Ð¹ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€ ÑƒÑÑ‚Ð°Ñ€ÐµÐ».">
+<!ENTITY aboutTor.outOfDateTorOff.label "ÐšÐ ÐžÐœÐ• Ð¢ÐžÐ“Ðž, Ð´Ð°Ð½Ð½Ñ‹Ð¹ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€ ÑƒÑÑ‚Ð°Ñ€ÐµÐ».">
+<!ENTITY aboutTor.outOfDate2.label "ÐšÐ»Ð¸ÐºÐ½Ð¸Ñ‚Ðµ Ð¿Ð¾ Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸ÑŽ Ð»ÑƒÐºÐ° Ð¸ Ð²Ñ‹Ð±Ð¸Ñ€Ð¸Ñ‚Ðµ Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ð° Tor Ð´Ð»Ñ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð°.">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.check.label "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐº 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.success.label "ÐŸÐ¾Ð·Ð´Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ!">
+<!ENTITY aboutTor.success2.label "Ð”Ð°Ð½Ð½Ñ‹Ð¹ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½ Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Tor.">
+<!ENTITY aboutTor.success3.label "Ð¢ÐµÐ¿ÐµÑ€ÑŒ Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ð¾ÑÐµÑ‰Ð°Ñ‚ÑŒ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-ÑÐ°Ð¹Ñ‚Ñ‹ Ð² Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾Ð¼ Ñ€ÐµÐ¶Ð¸Ð¼Ðµ.">
+<!ENTITY aboutTor.failure.label "Ð§Ñ‚Ð¾-Ñ‚Ð¾ Ð¿Ð¾ÑˆÐ»Ð¾ Ð½Ðµ Ñ‚Ð°Ðº!">
+<!ENTITY aboutTor.failure2.label "Tor Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚ Ð² ÑÑ‚Ð¾Ð¼ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ðµ.">
+<!ENTITY aboutTor.failure3prefix.label "Ð§Ñ‚Ð¾Ð±Ñ‹ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒ, Ð¾Ð±Ñ€Ð°Ñ‰Ð°Ð¹Ñ‚ÐµÑÑŒ:">
 <!ENTITY aboutTor.failure3Link "help at rt.torproject.org">
 <!ENTITY aboutTor.failure3suffix.label ".">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
+<!ENTITY aboutTor.search.label "ÐŸÐ¾Ð¸ÑÐº">
+
+<!-- Note to translators: the following 18 entities are used to construct a
+   - sentence (either the SP or DDG entities are used, but not both at the
+   - same time).   In English, the sentence reads:
+   -    Search securely with Startpage.
+   - or:
+   -    Search securely with DuckDuckGo.
+   - The sentence contains two embedded links for "securely" and
+   - the search engine ("Startpage" or "DuckDuckGo").
+  -->
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "ÐŸÐ¾Ð¸ÑÐº">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "ÐŸÐ¾Ð¸ÑÐº">
+<!ENTITY aboutTor.searchSP.privacy.label "Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾">
+<!ENTITY aboutTor.searchDDG.privacy.label "Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html">
 <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "with">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with">
+<!ENTITY aboutTor.searchSP.search.label "ÐÐ°Ñ‡Ð°Ð»ÑŒÐ½Ð°Ñ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ð°">
 <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
 <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
 <!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
 <!ENTITY aboutTor.searchSP.search.afterLink.label ".">
 <!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
 
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country & 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 "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ:">
+<!ENTITY aboutTor.torInfo2.label "Ð¡Ñ‚Ñ€Ð°Ð½Ð° & IP-Ð°Ð´Ñ€ÐµÑ">
+<!ENTITY aboutTor.torInfo3.label "ÐšÐ¾Ð½ÐµÑ‡Ð½Ñ‹Ð¹ ÑƒÐ·ÐµÐ»">
+<!ENTITY aboutTor.torInfo4.label "Ð”Ð°Ð½Ð½Ñ‹Ð¹ ÑÐµÑ€Ð²ÐµÑ€ Ð½Ðµ Ð²ÐµÐ´ÐµÑ‚ Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€ Ñ ÐºÐ°ÐºÐ¾Ð¹-Ð»Ð¸Ð±Ð¾ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÐµÐ¹ Ð¿Ð¾ Ð¿Ð¾ÑÐµÑ‚Ð¸Ñ‚ÐµÐ»ÑÐ¼.">
+<!ENTITY aboutTor.whatnextQuestion.label "Ð§Ñ‚Ð¾ Ð´Ð°Ð»ÐµÐµ?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor ÐÐ• ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ð¸ÑÑ‡ÐµÑ€Ð¿Ñ‹Ð²Ð°ÑŽÑ‰Ð¸Ð¼ ÑÑ€ÐµÐ´ÑÑ‚Ð²Ð¾Ð¼ Ð´Ð»Ñ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾Ð³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÑÐµÑ‚Ð¸! Ð’Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð’Ð°Ð¼ Ð¿Ñ€Ð¸Ð´ÐµÑ‚ÑÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ ÑÐ²Ð¾Ð¸ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¿Ñ€Ð¸Ð²Ñ‹Ñ‡ÐºÐ¸ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-ÑÐµÑ€Ñ„Ð¸Ð½Ð³Ð°, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¾Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ¸Ñ‚ÑŒ ÑÐ²Ð¾Ð¸ Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ Ð´Ð°Ð½Ð½Ñ‹Ðµ.">
+<!ENTITY aboutTor.whatnext.label "Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð°Ñ†Ð¸Ð¸ Ð¾ Ñ‚Ð¾Ð¼, ÐºÐ°Ðº ÑÐ¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ÑÑ‚ÑŒ Â»">
 <!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.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en">
-<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en">
+<!ENTITY aboutTor.helpInfo1.label "Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ð¾Ð¼Ð¾Ñ‡ÑŒ!">
+<!ENTITY aboutTor.helpInfo2.label "Ð•ÑÑ‚ÑŒ Ð¼Ð½Ð¾Ð³Ð¾ ÑÐ¿Ð¾ÑÐ¾Ð±Ð¾Ð² ÑÐ´ÐµÐ»Ð°Ñ‚ÑŒ Ð¡ÐµÑ‚ÑŒ Tor Ð±Ð¾Ð»ÐµÐµ Ð±Ñ‹ÑÑ‚Ñ€Ð¾Ð´ÐµÐ¹ÑÑ‚Ð²ÐµÐ½Ð½Ð¾Ð¹ Ð¸ ÑƒÑÑ‚Ð¾Ð¹Ñ‡Ð¸Ð²Ð¾Ð¹:">
+<!ENTITY aboutTor.helpInfo3.label "Ð—Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚Ðµ Ñ€ÐµÐ»ÐµÐ¹Ð½Ñ‹Ð¹ ÑƒÐ·ÐµÐ» Tor Â»">
+<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html#ru">
+<!ENTITY aboutTor.helpInfo4.label "ÐžÐºÐ°Ð·Ñ‹Ð²Ð°Ð¹Ñ‚Ðµ Ð´Ð¾Ð±Ñ€Ð¾Ð²Ð¾Ð»ÑŒÐ½ÑƒÑŽ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒ Â»">
+<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html#ru">
+<!ENTITY aboutTor.helpInfo5.label "Ð¡Ð´ÐµÐ»Ð°Ð¹Ñ‚Ðµ Ð²Ð·Ð½Ð¾Ñ Â»">
+<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html#ru">
 
-<!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.learnMore.link "https://www.torproject.org/about/overview.html.en">
+<!ENTITY aboutTor.footer.label "ÐŸÑ€Ð¾ÐµÐºÑ‚ Tor - ÑÑ‚Ð¾ Ð½ÐµÐºÐ¾Ð¼Ð¼ÐµÑ€Ñ‡ÐµÑÐºÐ°Ñ Ð¾Ñ€Ð³Ð°Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ñ‚Ð¸Ð¿Ð° US 501(c)(3), Ð¿Ñ€ÐµÐ´Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ð°Ñ Ð´Ð»Ñ Ð¸ÑÑÐ»ÐµÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ, Ñ€Ð°Ð·Ð²Ð¸Ñ‚Ð¸Ñ Ð¸ Ð¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð² Ð¾Ð±Ð»Ð°ÑÑ‚Ð¸ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ÑÑ‚Ð¸ Ð¸ Ð»Ð¸Ñ‡Ð½Ñ‹Ñ… Ð´Ð°Ð½Ð½Ñ‹Ñ….">
+<!ENTITY aboutTor.learnMore.label "Ð£Ð·Ð½Ð°Ð¹Ñ‚Ðµ Ð±Ð¾Ð»ÑŒÑˆÐµ Ð¾ ÐŸÑ€Ð¾ÐµÐºÑ‚Ðµ Tor Â»">
+<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html#ru
+">
diff --git a/src/chrome/locale/ru/brand.dtd b/src/chrome/locale/ru/brand.dtd
index 76e405d..b41f8ab 100644
--- a/src/chrome/locale/ru/brand.dtd
+++ b/src/chrome/locale/ru/brand.dtd
@@ -4,5 +4,5 @@
 
 <!ENTITY  brandShortName        "TorBrowser">
 <!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  vendorShortName       "ÐŸÑ€Ð¾ÐµÐºÑ‚ Tor">
+<!ENTITY  trademarkInfo.part1   "Firefox Ð¸ ÐµÐ³Ð¾ Ð»Ð¾Ð³Ð¾Ñ‚Ð¸Ð¿Ñ‹ ÑÑ‚Ð¾ Ñ‚Ð¾Ñ€Ð³Ð¾Ð²Ñ‹Ðµ Ð·Ð½Ð°ÐºÐ¸ Mozilla Foundation.">
diff --git a/src/chrome/locale/ru/brand.properties b/src/chrome/locale/ru/brand.properties
index 9ae168e..d4788a7 100644
--- a/src/chrome/locale/ru/brand.properties
+++ b/src/chrome/locale/ru/brand.properties
@@ -4,12 +4,12 @@
 
 brandShortName=TorBrowser
 brandFullName=Tor Browser
-vendorShortName=Tor Project
+vendorShortName=ÐŸÑ€Ð¾ÐµÐºÑ‚ Tor
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Firefox Start - Ð´Ð¾Ð¼Ð°ÑˆÐ½ÑÑ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ‡ÐºÐ° ÑÐ¾ Ð²ÑÑ‚Ñ€Ð¾ÐµÐ½Ð½Ñ‹Ð¼ Ð¿Ð¾Ð¸ÑÐºÐ¾Ð¼
+homePageImport=Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚ Ð²Ð°ÑˆÐµÐ¹ Ð´Ð¾Ð¼Ð°ÑˆÐ½ÐµÐ¹ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñ‹ Ð¸Ð· %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=Ð’Ñ‹Ð±Ð¾Ñ€ Ð´Ð¾Ð¼Ð°ÑˆÐ½ÐµÐ¹ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñ‹
+homePageMigrationDescription=Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð´Ð¾Ð¼Ð°ÑˆÐ½ÑŽÑŽ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ
 
-syncBrandShortName=Sync
+syncBrandShortName=Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ
diff --git a/src/chrome/locale/ru/browser.properties b/src/chrome/locale/ru/browser.properties
index 295a03a..e34fcba 100644
--- a/src/chrome/locale/ru/browser.properties
+++ b/src/chrome/locale/ru/browser.properties
@@ -5,9 +5,9 @@ browser.startup.homepage=about:tor
 spellchecker.dictionary=en_US
 
 # Default search engine
-browser.search.defaultenginename=Startpage
+browser.search.defaultenginename=ÐÐ°Ñ‡Ð°Ð»ÑŒÐ½Ð°Ñ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ð°
 
 # Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Startpage
+browser.search.order.1=ÐÐ°Ñ‡Ð°Ð»ÑŒÐ½Ð°Ñ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ð°
 browser.search.order.2=DuckDuckGo
 browser.search.order.3=Google
diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd
index ea4ab5d..41ab358 100644
--- a/src/chrome/locale/ru/torbutton.dtd
+++ b/src/chrome/locale/ru/torbutton.dtd
@@ -95,7 +95,7 @@
 <!ENTITY torbutton.prefs.block_links "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ‰ÐµÐ»Ñ‡ÐºÐ¸ Ð¿Ð¾ ÑÑÑ‹Ð»ÐºÐ°Ð¼ Ð¸ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÑƒ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ† Ð¸Ð· Ñ€Ð°Ð·Ð½Ñ‹Ñ… Ñ€ÐµÐ¶Ð¸Ð¼Ð¾Ð² Tor (Ð½ÐµÐ¾Ð±ÑÐ·.)">
 <!ENTITY torbutton.prefs.jar_certs "Ð¥Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ SSL ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ñ‹ Ð² Ñ€Ð°Ð·Ð´ÐµÐ»ÑŒÐ½Ñ‹Ñ… jar-Ñ„Ð°Ð¹Ð»Ð°Ñ… Ð´Ð»Ñ Tor/Ð½Ðµ-Tor (Ð¶ÐµÐ»Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾)">
 <!ENTITY torbutton.prefs.jar_ca_certs "Ð¥Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ CA ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ñ‹ Ð² Ñ€Ð°Ð·Ð´ÐµÐ»ÑŒÐ½Ñ‹Ñ… jar-Ñ„Ð°Ð¹Ð»Ð°Ñ… Ð´Ð»Ñ Tor/Ð½Ðµ-Tor (Ð¶ÐµÐ»Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾)">
-<!ENTITY torbutton.prefs.locked_mode 'ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ "ÐšÐ½Ð¾Ð¿ÐºÑƒ" Ð¸ "Ð“Ð¾Ñ€ÑÑ‡Ð¸Ðµ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ¸" Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰ÐµÐ½Ñ ÑÐ»ÑƒÑ‡Ð°Ð¹Ð½Ð¾Ð³Ð¾ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð°'>
+<!ENTITY torbutton.prefs.locked_mode "ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ "ÐšÐ½Ð¾Ð¿ÐºÑƒ" Ð¸ "Ð“Ð¾Ñ€ÑÑ‡Ð¸Ðµ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ¸" Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰ÐµÐ½Ñ ÑÐ»ÑƒÑ‡Ð°Ð¹Ð½Ð¾Ð³Ð¾ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð°">
 <!ENTITY torbutton.prefs.startup_state "ÐŸÑ€Ð¸ Ð¾Ð±Ñ‹Ñ‡Ð½Ð¾Ð¼ Ð·Ð°Ð¿ÑƒÑÐºÐµ (Ð±ÐµÐ· Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑÐµÑÑÐ¸Ð¸), ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ñ‚ÑŒ ÑÐ¾ÑÑ‚Ð¾ÑÐ½Ð¸Ðµ Tor Ð²:">
 <!ENTITY torbutton.prefs.shutdown_state "Ð’Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾Ðµ ÑÐ¾ÑÑ‚Ð¾ÑÐ½Ð¸Ðµ">
 <!ENTITY torbutton.prefs.startup "Ð—Ð°Ð¿ÑƒÑÐº">
@@ -116,10 +116,10 @@
 <!ENTITY torbutton.prefs.no_proxy_warning "Ð’Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ: ÐÐµ Ð²Ð½Ð¾ÑÐ¸Ñ‚Ðµ Ð½Ð¸ÐºÐ°ÐºÐ¸Ñ… Ð¸Ð¼ÐµÐ½ Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð² Ð² Ð¿Ð¾Ð»Ðµ Ð²Ñ‹ÑˆÐµ">
 <!ENTITY torbutton.prefs.spoofreresh "Ð¡Ñ‚ÐµÑ€ÐµÑ‚ÑŒ Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð° Ð¿Ð¾Ð´ÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ðº">
 <!ENTITY torbutton.prefs.refereroptions "ÐžÐ¿Ñ†Ð¸Ð¸ Ð¿Ð¾Ð´ÑÑ‚Ð°Ð½Ð¾Ð²Ð¾Ðº Ñ€ÐµÑ„ÐµÑ€ÐµÑ€Ð¾Ð²">
-<!ENTITY torbutton.prefs.nospoof "ÐžÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¸ÑÑ…Ð¾Ð´Ð½Ñ‹Ð¹ Ñ€ÐµÑ„ÐµÑ€ÐµÑ€, ÐºÐ°Ðº ÐµÑÑ‚ÑŒ">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.spoofroot "ÐŸÐ¾Ð´Ð¼ÐµÐ½Ð° ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ñ‰Ð¸Ñ… Ð¿Ð°Ð¿ÐºÐ¸ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñ‹">
 <!ENTITY torbutton.prefs.spoofdomain "ÐŸÐ¾Ð´Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð´Ð¾Ð¼ÐµÐ½ Ð² ÐºÐ°Ñ‡ÐµÑÑ‚Ð²Ðµ Ñ€ÐµÑ„ÐµÑ€ÐµÑ€Ð°">
-<!ENTITY torbutton.prefs.spoofblank "Ð¡Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ñ€ÐµÑ„ÐµÑ€ÐµÑ€ Ð¿ÑƒÑÑ‚Ñ‹Ð¼">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "Ð£Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð·Ð°Ñ‰Ð¸Ñ‚Ð¾Ð¹ Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "Ð—Ð°Ñ‰Ð¸Ñ‰ÐµÐ½Ð¾">
 <!ENTITY torbutton.cookiedialog.domainCol "Ð˜Ð¼Ñ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð°">
@@ -131,7 +131,7 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð²ÑÐµ ÐºÑ€Ð¾Ð¼Ðµ Ð·Ð°Ñ‰Ð¸Ñ‰Ñ‘Ð½Ð½Ñ‹Ñ…">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Ð—Ð°Ñ‰Ð¸Ñ‰Ð°Ñ‚ÑŒ Ð½Ð¾Ð²Ñ‹Ðµ Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ÐÐµ Ð·Ð°Ñ‰Ð¸Ñ‰Ð°Ñ‚ÑŒ Ð½Ð¾Ð²Ñ‹Ðµ Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Livemarks Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ Ð² Tor">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚ÑÑ)">
 <!ENTITY torbutton.prefs.dtd_optional "(Ð¿Ð¾ Ð¶ÐµÐ»Ð°Ð½Ð¸ÑŽ)">
 <!ENTITY torbutton.prefs.dtd_crucial "(ÐºÑ€Ð¸Ñ‚Ð¸Ñ‡Ð½Ð¾)">
diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties
index 4f6d2ba..aec58c5 100644
--- a/src/chrome/locale/ru/torbutton.properties
+++ b/src/chrome/locale/ru/torbutton.properties
@@ -36,7 +36,7 @@ torbutton.popup.redirect = ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ
 torbutton.popup.no_redirect = ÐÐµ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ
 torbutton.popup.prompted_language = Ð”Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÑŒÑˆÐµÐ¹ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ð¸, Torbutton Ð¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð¿Ñ€Ð°ÑˆÐ¸Ð²Ð°Ñ‚ÑŒ Ð²ÐµÑ€ÑÐ¸Ð¸ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ† Ð½Ð° Ð°Ð½Ð³Ð»Ð¸Ð¹ÑÐºÐ¾Ð¼ ÑÐ·Ñ‹ÐºÐµ. ÐÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð¿Ð¾Ð²Ð»ÐµÑ‡ÑŒ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ðµ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ† Ð½Ð° Ð°Ð½Ð³Ð»Ð¸Ð¹ÑÐºÐ¾Ð¼ ÑÐ·Ñ‹ÐºÐµ, Ð²Ð¼ÐµÑÑ‚Ð¾ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð¸Ñ… Ð½Ð° Ð²Ð°ÑˆÐµÐ¼ Ñ€Ð¾Ð´Ð½Ð¾Ð¼ ÑÐ·Ñ‹ÐºÐµ.\n\nÐ¥Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð·Ð°Ð¿Ñ€Ð°ÑˆÐ¸Ð²Ð°Ñ‚ÑŒ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñ‹ Ð½Ð° Ð°Ð½Ð³Ð»Ð¸Ð¹ÑÐºÐ¾Ð¼ ÑÐ·Ñ‹ÐºÐµ Ð´Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆÐµÐ¹ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ð¸?
 torbutton.popup.no_newnym = Torbutton Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ Ð´Ð°Ñ‚ÑŒ Ð²Ð°Ð¼ Ð½Ð¾Ð²ÑƒÑŽ Ð»Ð¸Ñ‡Ð½Ð¾ÑÑ‚ÑŒ. ÐžÐ½ Ð½Ðµ Ð¸Ð¼ÐµÐµÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð° Ðº Tor Control Port.\n\nÐ’Ñ‹ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚Ðµ Tor Browser Bundle?
-torbutton.popup.use_tbb = ÐŸÐ¾Ñ…Ð¾Ð¶Ðµ, Ñ‡Ñ‚Ð¾ Ð²Ñ‹ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚Ðµ Torbutton Ð¸ Firefox, Ñ‡Ñ‚Ð¾ Ð±Ð¾Ð»ÐµÐµ Ð½Ðµ ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼Ð¾Ð¹ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾Ð¹ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÐµÐ¹.\n\nÐ’Ð¼ÐµÑÑ‚Ð¾ ÑÑ‚Ð¾Ð³Ð¾, Ð¼Ñ‹ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼ Ð²Ð°Ð¼ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ð¹ Tor Browser Bundle Ð¾Ñ‚Ð¾ÑÐ»Ð°Ð² email Ð½Ð° gettor at torproject.org Ð¸Ð»Ð¸ ÑÐºÐ°Ñ‡Ð°Ð² ÐµÐ³Ð¾ Ð¿Ð¾ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰ÐµÐ¹ ÑÑÑ‹Ð»ÐºÐµ: 
+torbutton.popup.use_tbb = ÐŸÐ¾Ñ…Ð¾Ð¶Ðµ, Ñ‡Ñ‚Ð¾ Ð²Ñ‹ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚Ðµ Torbutton Ð¸ Firefox, Ñ‡Ñ‚Ð¾ Ð±Ð¾Ð»ÐµÐµ Ð½Ðµ ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼Ð¾Ð¹ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾Ð¹ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÐµÐ¹.\n\nÐ’Ð¼ÐµÑÑ‚Ð¾ ÑÑ‚Ð¾Ð³Ð¾, Ð¼Ñ‹ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼ Ð²Ð°Ð¼ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ð¹ Tor Browser Bundle Ð¾Ñ‚Ð¾ÑÐ»Ð°Ð² email Ð½Ð° gettor at torproject.org Ð¸Ð»Ð¸ ÑÐºÐ°Ñ‡Ð°Ð² ÐµÐ³Ð¾ Ð¿Ð¾ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰ÐµÐ¹ ÑÑÑ‹Ð»ÐºÐµ:
 torbutton.popup.pref_error = Torbutton Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð² Ð¿Ð°Ð¿ÐºÐµ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Tor Browser.
 torbutton.popup.permission_denied = ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð»Ð¸Ð±Ð¾ ÑÐ±Ñ€Ð¾ÑÑŒÑ‚Ðµ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿Ð°Ð¿ÐºÐ¸ Tor Browser Ð¸Ð»Ð¸ ÑÐºÐ¾Ð¿Ð¸Ñ€ÑƒÐ¹Ñ‚Ðµ ÐµÑ‘ Ð² Ð´Ñ€ÑƒÐ³Ð¾Ðµ Ð¼ÐµÑÑ‚Ð¾.
 torbutton.popup.device_full = ÐŸÐ¾Ñ…Ð¾Ð¶Ðµ, Ñ‡Ñ‚Ð¾ Ð´Ð¸ÑÐº Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¾ÑÐ²Ð¾Ð±Ð¾Ð´Ð¸Ñ‚Ðµ Ð¼ÐµÑÑ‚Ð¾ Ð¸Ð»Ð¸ Ð¿ÐµÑ€ÐµÐ¼ÐµÑÑ‚Ð¸Ñ‚Ðµ Tor Browser Ð½Ð° Ð´Ñ€ÑƒÐ³Ð¾Ð¹ Ð´Ð¸ÑÐº.
diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd
index 2fc51c6..2987c1b 100644
--- a/src/chrome/locale/vi/aboutTor.dtd
+++ b/src/chrome/locale/vi/aboutTor.dtd
@@ -4,61 +4,70 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "">
 
-<!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 "">
+<!ENTITY aboutTor.outOfDateTorOff.label "">
+<!ENTITY aboutTor.outOfDate2.label "">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.check.label "">
 
-<!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 at rt.torproject.org">
-<!ENTITY aboutTor.failure3suffix.label ".">
+<!ENTITY aboutTor.success.label "">
+<!ENTITY aboutTor.success2.label "">
+<!ENTITY aboutTor.success3.label "">
+<!ENTITY aboutTor.failure.label "">
+<!ENTITY aboutTor.failure2.label "">
+<!ENTITY aboutTor.failure3prefix.label "">
+<!ENTITY aboutTor.failure3Link "">
+<!ENTITY aboutTor.failure3suffix.label "">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
-<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
+<!ENTITY aboutTor.search.label "TÃ¬m kiáº¿m">
+
+<!-- Note to translators: the following 18 entities are used to construct a
+   - sentence (either the SP or DDG entities are used, but not both at the
+   - same time).   In English, the sentence reads:
+   -    Search securely with Startpage.
+   - or:
+   -    Search securely with DuckDuckGo.
+   - The sentence contains two embedded links for "securely" and
+   - the search engine ("Startpage" or "DuckDuckGo").
+  -->
+<!ENTITY aboutTor.searchSPPost.link "">
+<!ENTITY aboutTor.searchDDGPost.link "">
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
+<!ENTITY aboutTor.searchSP.privacy.label "">
+<!ENTITY aboutTor.searchDDG.privacy.label "">
+<!ENTITY aboutTor.searchSP.privacy.link "">
+<!ENTITY aboutTor.searchDDG.privacy.link "">
 <!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
 <!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
+<!ENTITY aboutTor.searchSP.search.label "">
+<!ENTITY aboutTor.searchDDG.search.label "">
+<!ENTITY aboutTor.searchSP.search.link "">
+<!ENTITY aboutTor.searchDDG.search.link "">
+<!ENTITY aboutTor.searchSP.search.afterLink.label "">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
 
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
-
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country & 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.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.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en">
-<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en">
+<!ENTITY aboutTor.torInfo1.label "">
+<!ENTITY aboutTor.torInfo2.label "">
+<!ENTITY aboutTor.torInfo3.label "">
+<!ENTITY aboutTor.torInfo4.label "">
+<!ENTITY aboutTor.whatnextQuestion.label "">
+<!ENTITY aboutTor.whatnextAnswer.label "">
+<!ENTITY aboutTor.whatnext.label "">
+<!ENTITY aboutTor.whatnext.link "">
+<!ENTITY aboutTor.helpInfo1.label "">
+<!ENTITY aboutTor.helpInfo2.label "">
+<!ENTITY aboutTor.helpInfo3.label "">
+<!ENTITY aboutTor.helpInfo3.link "">
+<!ENTITY aboutTor.helpInfo4.label "">
+<!ENTITY aboutTor.helpInfo4.link "">
+<!ENTITY aboutTor.helpInfo5.label "">
+<!ENTITY aboutTor.helpInfo5.link "">
 
-<!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.learnMore.link "https://www.torproject.org/about/overview.html.en">
+<!ENTITY aboutTor.footer.label "">
+<!ENTITY aboutTor.learnMore.label "">
+<!ENTITY aboutTor.learnMore.link "">
diff --git a/src/chrome/locale/vi/brand.dtd b/src/chrome/locale/vi/brand.dtd
index 76e405d..e34f480 100644
--- a/src/chrome/locale/vi/brand.dtd
+++ b/src/chrome/locale/vi/brand.dtd
@@ -2,7 +2,7 @@
    - 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        "TorBrowser">
-<!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  brandShortName        "">
+<!ENTITY  brandFullName         "">
+<!ENTITY  vendorShortName       "">
+<!ENTITY  trademarkInfo.part1   "">
diff --git a/src/chrome/locale/vi/brand.properties b/src/chrome/locale/vi/brand.properties
index 9ae168e..6598ccd 100644
--- a/src/chrome/locale/vi/brand.properties
+++ b/src/chrome/locale/vi/brand.properties
@@ -2,14 +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/.
 
-brandShortName=TorBrowser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+# brandShortName=TorBrowser
+# brandFullName=Tor Browser
+# vendorShortName=Tor Project
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+# homePageSingleStartMain=Firefox Start, a fast home page with built-in search
+# homePageImport=Import your home page from %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+# homePageMigrationPageTitle=Home Page Selection
+# homePageMigrationDescription=Please select the home page you wish to use:
 
-syncBrandShortName=Sync
+# syncBrandShortName=Sync
diff --git a/src/chrome/locale/vi/browser.properties b/src/chrome/locale/vi/browser.properties
index 295a03a..fd25b10 100644
--- a/src/chrome/locale/vi/browser.properties
+++ b/src/chrome/locale/vi/browser.properties
@@ -1,13 +1,13 @@
 # Default home page
-browser.startup.homepage=about:tor
+# browser.startup.homepage=about:tor
 
 # Spell checker dictionary
-spellchecker.dictionary=en_US
+# spellchecker.dictionary=en_US
 
 # Default search engine
-browser.search.defaultenginename=Startpage
+# browser.search.defaultenginename=Startpage
 
 # Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Startpage
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
+# browser.search.order.1=Startpage
+# browser.search.order.2=DuckDuckGo
+# browser.search.order.3=Google
diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index af36b27..dd4b70e 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/vi/torbutton.dtd
@@ -116,10 +116,10 @@
 <!ENTITY torbutton.prefs.no_proxy_warning "Cáº£nh bÃ¡o: TrÃ¡nh sá» dá»¥ng báº¥t ká»³ tÃªn mÃ¡y chá»§ á»Ÿ trÃªn">
 <!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
 <!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
-<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
 <!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
-<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -131,7 +131,7 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "VÃ´ hiá»‡u hÃ³a viá»‡c cáºp nháºt Ä‘Ã¡nh-dáº¥u-Ä‘á»™ng trong quÃ¡ trÃ¬nh dÃ¹ng Tor">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(khuyáº¿n cÃ¡o)">
 <!ENTITY torbutton.prefs.dtd_optional "(phá»¥)">
 <!ENTITY torbutton.prefs.dtd_crucial "(cáº¥p thiáº¿t)">
diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties
index 1c55bdd..375aa35 100644
--- a/src/chrome/locale/vi/torbutton.properties
+++ b/src/chrome/locale/vi/torbutton.properties
@@ -9,7 +9,7 @@ torbutton.panel.label.enabled = Tor Ä‘Æ°á»£c báºt
 extensions.torbutton at torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton khÃ³a nhá»¯ng tháº» trÃ¬nh duyá»‡t Ä‘Ã£ táº£i trong má»™t tráº¡ng thÃ¡i khÃ¡c cá»§a Tor.\n\nCÃ¡i nÃ y lÃ  Ä‘á»ƒ váºn hÃ nh xung quanh lá»—i Firefox 409737 vÃ  417869.\n\nNáº¿u thÃ´ng bÃ¡o nÃ y hiá»‡n ra cháº³ng vÃ¬ lÃ½ do nÃ o, thÃ¬ má»™t trong nhá»¯ng tháº» trÃ¬nh duyá»‡t Ä‘ang cá»‘ tá»± táº£i láº¡i mÃ  khÃ´ng thÃ´ng bÃ¡o, vÃ  Ä‘iá»u nÃ y Ä‘Ã£ bá»‹ ngÄƒn cháº·n.\n\nTor táº£i láº¡i tháº» trÃ¬nh duyá»‡t trong tráº¡ng thÃ¡i nÃ y cá»§a Tor, gÃµ 'enter' trÃªn thanh Ä‘á»‹a chá»‰.\n\n
 torbutton.popup.plugin.warning = Torbutton cháº·n viá»‡c táº£i trá»±c tiáº¿p Tor ná»™i dung pháº§n bá»• trá»£.\n\nNÃªn dÃ¹ng LÆ°u DÆ°á»›i Dáº¡ng.\n\n
-torbutton.popup.confirm_ca_certs = LÆ°u Ã½ Torbutton: CÃ³ váº» báº¡n khÃ´ng cÃ³ NhÃ  cáº¥p phÃ¡t Chá»©ng thÆ° (CA) tÃ¹y biáº¿n. Kiá»ƒm tra danh sÃ¡ch CA lÃ  má»™t quÃ¡ trÃ¬nh khÃ¡ lÃ¢u vÃ  sáº½ lÃ m cháºm viá»‡c báºt táº¯t Tor. Báº¡n cÃ³ muá»‘n vÃ´ hiá»‡u hÃ³a viá»‡c cÃ´ láºp cÃ¡c chá»©ng thÆ° cá»§a CA khÃ´ng? (Náº¿u báº¡n khÃ´ng hiá»ƒu viá»‡c nÃ y, cá»© nháº¥n OK lÃ  Ä‘Æ°á»£c) 
+torbutton.popup.confirm_ca_certs = LÆ°u Ã½ Torbutton: CÃ³ váº» báº¡n khÃ´ng cÃ³ NhÃ  cáº¥p phÃ¡t Chá»©ng thÆ° (CA) tÃ¹y biáº¿n. Kiá»ƒm tra danh sÃ¡ch CA lÃ  má»™t quÃ¡ trÃ¬nh khÃ¡ lÃ¢u vÃ  sáº½ lÃ m cháºm viá»‡c báºt táº¯t Tor. Báº¡n cÃ³ muá»‘n vÃ´ hiá»‡u hÃ³a viá»‡c cÃ´ láºp cÃ¡c chá»©ng thÆ° cá»§a CA khÃ´ng? (Náº¿u báº¡n khÃ´ng hiá»ƒu viá»‡c nÃ y, cá»© nháº¥n OK lÃ  Ä‘Æ°á»£c)
 torbutton.popup.ff3.warning = Cáº£nh bÃ¡o!\n\nTorbutton trÃªn Firefox 3 lÃ m lá»™ mÃºi giá» vÃ  Ä‘Ã¡nh-dáº¥u-Ä‘á»™ng cá»§a báº¡n thÃ´ng qua Tor.\n\nBáº¡n cÃ³ cÃ²n muá»‘n tiáº¿p tá»¥c khÃ´ng?
 torbutton.popup.toggle.warning = Báº¡n cáº§n báºt táº¯t Tor hoáº·c khá»Ÿi Ä‘á»™ng láº¡i Ä‘á»ƒ thiáº¿t láºp cÃ³ hiá»‡u lá»±c.
 torbutton.popup.test.success = Thá» nghiá»‡m Tor thÃ nh cÃ´ng!
diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd
index 2fc51c6..7a0a3d0 100644
--- a/src/chrome/locale/zh-CN/aboutTor.dtd
+++ b/src/chrome/locale/zh-CN/aboutTor.dtd
@@ -4,61 +4,70 @@
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "å…³äºŽ 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 "ä½†æ˜¯è¯¥æµè§ˆå™¨å¹¶éžæœ€æ–°ç‰ˆæœ¬ã€‚">
+<!ENTITY aboutTor.outOfDateTorOff.label "å¦å¤–ï¼Œè¯¥æµè§ˆå™¨å¹¶éžæœ€æ–°ç‰ˆæœ¬ã€‚">
+<!ENTITY aboutTor.outOfDate2.label "è¯·å•å‡»æ´‹è‘±å›¾æ ‡ï¼Œç„¶åŽé€‰æ‹©â€œä¸‹è½½ Tor Browser Bundleâ€æ›´æ–°ã€‚">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.check.label "æµ‹è¯• 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.success.label "æˆåŠŸï¼">
+<!ENTITY aboutTor.success2.label "è¯¥æµè§ˆå™¨å·²é…ç½®ä¸ºä½¿ç”¨ Tor ç½‘ç»œã€‚">
+<!ENTITY aboutTor.success3.label "çŽ°åœ¨å³å¯è‡ªç”±åœ°åŒ¿åè®¿é—®äº’è”ç½‘ã€‚">
+<!ENTITY aboutTor.failure.label "å‡ºé”™äº†ï¼">
+<!ENTITY aboutTor.failure2.label "Tor æ— æ³•åœ¨è¯¥æµè§ˆå™¨ä¸‹è¿è¡Œã€‚">
+<!ENTITY aboutTor.failure3prefix.label "å¦‚éœ€å¸®åŠ©ï¼Œè¯·è”ç³»ï¼š">
 <!ENTITY aboutTor.failure3Link "help at rt.torproject.org">
-<!ENTITY aboutTor.failure3suffix.label ".">
+<!ENTITY aboutTor.failure3suffix.label "ã€‚">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
+<!ENTITY aboutTor.search.label "æœç´¢">
+
+<!-- Note to translators: the following 18 entities are used to construct a
+   - sentence (either the SP or DDG entities are used, but not both at the
+   - same time).   In English, the sentence reads:
+   -    Search securely with Startpage.
+   - or:
+   -    Search securely with DuckDuckGo.
+   - The sentence contains two embedded links for "securely" and
+   - the search engine ("Startpage" or "DuckDuckGo").
+  -->
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
+<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "æœç´¢">
+<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "æœç´¢">
+<!ENTITY aboutTor.searchSP.privacy.label "å®‰å…¨">
+<!ENTITY aboutTor.searchDDG.privacy.label "å®‰å…¨">
+<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html">
 <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
+<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
+<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
+<!ENTITY aboutTor.searchSP.search.beforeLink.label "å¼•æ“Ž">
+<!ENTITY aboutTor.searchDDG.search.beforeLink.label "å¼•æ“Ž">
 <!ENTITY aboutTor.searchSP.search.label "Startpage">
 <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
 <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
 <!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
+<!ENTITY aboutTor.searchSP.search.afterLink.label "ã€‚">
+<!ENTITY aboutTor.searchDDG.search.afterLink.label "ã€‚">
 
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country & 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 "æ›´å¤šä¿¡æ¯ï¼š">
+<!ENTITY aboutTor.torInfo2.label "å›½å®¶ä¸Ž IP åœ°å€ï¼š">
+<!ENTITY aboutTor.torInfo3.label "å‡ºå£èŠ‚ç‚¹ï¼š">
+<!ENTITY aboutTor.torInfo4.label "æœ¬æœåŠ¡å™¨ä¸è®°å½•æœ‰å…³è®¿é—®è€…çš„ä»»ä½•ä¿¡æ¯ã€‚">
+<!ENTITY aboutTor.whatnextQuestion.label "ä¸‹ä¸€æ¥ï¼Ÿ">
+<!ENTITY aboutTor.whatnextAnswer.label "ä»…ä»…ä½¿ç”¨ Tor æ— æ³•å®žçŽ°åŒ¿åæµè§ˆã€‚ä¸ºäº†ç¡®ä¿èº«ä»½å®‰å…¨ï¼Œä½ å¯èƒ½éœ€è¦æ”¹å˜æŸäº›æµè§ˆä¹ æƒ¯ã€‚">
+<!ENTITY aboutTor.whatnext.label "ä¿æŒåŒ¿åå°æŠ€å·§ Â»">
 <!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.helpInfo1.label "ä½ ä¹Ÿå¯ä»¥å¸®å¿™ï¼">
+<!ENTITY aboutTor.helpInfo2.label "å¯é€šè¿‡å¾ˆå¤šæ–¹å¼æä¾›å¸®åŠ©ï¼Œè®© Tor ç½‘ç»œå˜å¾—æ›´å¿«æ›´å¼ºå¤§ï¼š">
+<!ENTITY aboutTor.helpInfo3.label "è¿è¡Œ 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 "æä¾›å¿—æ„¿æœåŠ¡ Â»">
 <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»">
+<!ENTITY aboutTor.helpInfo5.label "æåŠ© Â»">
 <!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 "The Tor Project æ˜¯ä¸€å®¶ç¾Žå›½ 501(c)(3) éžè¥åˆ©ç»„ç»‡ï¼Œè‡´åŠ›äºŽåœ¨çº¿åŒ¿åä¸Žéšç§çš„ç ”ç©¶ã€å¼€å‘ä¸Žæ•™è‚²ã€‚">
+<!ENTITY aboutTor.learnMore.label "äº†è§£æ›´å¤šæœ‰å…³ The Tor Project çš„ä¿¡æ¯ Â»">
 <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">
diff --git a/src/chrome/locale/zh-CN/brand.dtd b/src/chrome/locale/zh-CN/brand.dtd
index 76e405d..e6464da 100644
--- a/src/chrome/locale/zh-CN/brand.dtd
+++ b/src/chrome/locale/zh-CN/brand.dtd
@@ -5,4 +5,4 @@
 <!ENTITY  brandShortName        "TorBrowser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "Firefox ä¸Ž Firefox å›¾æ ‡ä¸º Mozilla Foundation çš„å•†æ ‡ã€‚">
diff --git a/src/chrome/locale/zh-CN/brand.properties b/src/chrome/locale/zh-CN/brand.properties
index 9ae168e..151e991 100644
--- a/src/chrome/locale/zh-CN/brand.properties
+++ b/src/chrome/locale/zh-CN/brand.properties
@@ -6,10 +6,10 @@ brandShortName=TorBrowser
 brandFullName=Tor Browser
 vendorShortName=Tor Project
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Firefox Startï¼šå†…ç½®æœç´¢åŠŸèƒ½çš„å¿«é€Ÿå¯åŠ¨ä¸»é¡µ
+homePageImport=ä»Ž %S å¯¼å…¥ä¸»é¡µ
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=ä¸»é¡µé€‰æ‹©
+homePageMigrationDescription=è¯·é€‰æ‹©æƒ³è¦ä½¿ç”¨çš„ä¸»é¡µï¼š
 
-syncBrandShortName=Sync
+syncBrandShortName=åŒæ¥
diff --git a/src/chrome/locale/zh-CN/browser.properties b/src/chrome/locale/zh-CN/browser.properties
index 295a03a..b3a313b 100644
--- a/src/chrome/locale/zh-CN/browser.properties
+++ b/src/chrome/locale/zh-CN/browser.properties
@@ -2,7 +2,7 @@
 browser.startup.homepage=about:tor
 
 # Spell checker dictionary
-spellchecker.dictionary=en_US
+spellchecker.dictionary=zh_CN
 
 # Default search engine
 browser.search.defaultenginename=Startpage
diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd
index f8575b9..7c77238 100644
--- a/src/chrome/locale/zh-CN/torbutton.dtd
+++ b/src/chrome/locale/zh-CN/torbutton.dtd
@@ -116,10 +116,10 @@
 <!ENTITY torbutton.prefs.no_proxy_warning "è¦å‘Šï¼šè¯·ä¸è¦ä½¿ç”¨ä¸Šè¿°ä»»ä½•ä¸»æœºåã€‚">
 <!ENTITY torbutton.prefs.spoofreresh "ä¼ªé€ åˆ·æ–°">
 <!ENTITY torbutton.prefs.refereroptions "Referer æ¬ºéª—é€‰é¡¹">
-<!ENTITY torbutton.prefs.nospoof "æ£å¸¸ Referer">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.spoofroot "ä¼ªé€ åŒ…å«æ–‡ä»¶å¤¹çš„é¡µé¢">
 <!ENTITY torbutton.prefs.spoofdomain "ä¼ªé€ åŸŸåä½œä¸º Referer">
-<!ENTITY torbutton.prefs.spoofblank "åˆ¶ä½œç©ºç™½ Referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "ç®¡ç†å—ä¿æŠ¤çš„ Cookie">
 <!ENTITY torbutton.cookiedialog.lockCol "å—ä¿æŠ¤">
 <!ENTITY torbutton.cookiedialog.domainCol "æœåŠ¡å™¨">
@@ -131,7 +131,7 @@
 <!ENTITY torbutton.cookiedialog.removeAllBut "å…¨éƒ¨ç§»é™¤ä»…ä¿ç•™å—ä¿æŠ¤çš„ Cookie">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "ä¿æŠ¤æ–°çš„ Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ä¸ä¿æŠ¤æ–°çš„ Cookies">
-<!ENTITY torbutton.prefs.disable_livemarks "ä½¿ç”¨ Tor æ—¶ç¦ç”¨ Livemark æ›´æ–°ï¼ˆRSS ä¹¦ç¾ï¼‰">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "ï¼ˆæŽ¨èï¼‰">
 <!ENTITY torbutton.prefs.dtd_optional "ï¼ˆå¯é€‰ï¼‰">
 <!ENTITY torbutton.prefs.dtd_crucial "ï¼ˆé‡è¦ï¼‰">



