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

[tor-commits] [torbutton/master] Translations update

To: tor-commits@xxxxxxxxxxxxxxxxxxxx, tbb-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [torbutton/master] Translations update
From: gk@xxxxxxxxxxxxxx
Date: Thu, 16 Aug 2018 10:14:23 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 16 Aug 2018 06:14:54 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 1f316a27edf886f450a4ad1a1d684fb1df8ead66
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Date:   Thu Aug 16 10:10:56 2018 +0000

    Translations update
---
 src/chrome/locale/ar/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/ar/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/ar/torbutton.properties          |  4 +-
 src/chrome/locale/bn-BD/aboutTor.dtd               | 42 ++++--------
 .../locale/bn-BD/browserOnboarding.properties      | 38 +++++++++++
 src/chrome/locale/bn-BD/torbutton.dtd              |  4 +-
 src/chrome/locale/bn-BD/torbutton.properties       | 10 +--
 src/chrome/locale/ca/aboutDialog.dtd               | 19 ++++++
 src/chrome/locale/ca/aboutTBUpdate.dtd             |  6 ++
 src/chrome/locale/ca/aboutTor.dtd                  | 54 +++++-----------
 src/chrome/locale/ca/aboutTor.properties           | 19 ++++--
 src/chrome/locale/ca/brand.dtd                     | 15 +++--
 src/chrome/locale/ca/brand.properties              | 15 +++--
 src/chrome/locale/ca/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/ca/torbutton.dtd                 | 61 +++++++++++++-----
 src/chrome/locale/ca/torbutton.properties          | 67 +++++++++++++------
 src/chrome/locale/da/aboutTBUpdate.dtd             |  2 +-
 src/chrome/locale/da/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/da/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/da/torbutton.dtd                 |  6 +-
 src/chrome/locale/da/torbutton.properties          | 10 +--
 src/chrome/locale/de/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/de/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/de/torbutton.dtd                 |  4 +-
 src/chrome/locale/de/torbutton.properties          |  8 +--
 src/chrome/locale/es/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/es/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/es/torbutton.properties          |  6 +-
 src/chrome/locale/eu/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/eu/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/fa/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/fa/brand.properties              |  2 +-
 src/chrome/locale/fa/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/fa/torbutton.dtd                 |  6 +-
 src/chrome/locale/fr/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/fr/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/fr/torbutton.dtd                 |  2 +-
 src/chrome/locale/fr/torbutton.properties          |  6 +-
 src/chrome/locale/ga/aboutDialog.dtd               | 19 ++++++
 src/chrome/locale/ga/aboutTBUpdate.dtd             |  6 ++
 src/chrome/locale/ga/aboutTor.dtd                  | 54 +++++-----------
 src/chrome/locale/ga/aboutTor.properties           | 19 ++++--
 src/chrome/locale/ga/brand.dtd                     | 15 +++--
 src/chrome/locale/ga/brand.properties              | 17 ++---
 src/chrome/locale/ga/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/ga/torbutton.dtd                 | 67 +++++++++++++------
 src/chrome/locale/ga/torbutton.properties          | 75 +++++++++++++++-------
 src/chrome/locale/he/aboutDialog.dtd               |  2 +-
 src/chrome/locale/he/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/he/brand.properties              |  4 +-
 src/chrome/locale/he/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/he/torbutton.properties          |  8 +--
 src/chrome/locale/id/aboutDialog.dtd               | 19 ++++++
 src/chrome/locale/id/aboutTBUpdate.dtd             |  6 ++
 src/chrome/locale/id/aboutTor.dtd                  | 54 +++++-----------
 src/chrome/locale/id/aboutTor.properties           | 21 +++---
 src/chrome/locale/id/brand.dtd                     | 15 +++--
 src/chrome/locale/id/brand.properties              | 17 ++---
 src/chrome/locale/id/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/id/torbutton.dtd                 | 43 +++++++++++--
 src/chrome/locale/id/torbutton.properties          | 51 ++++++++++++---
 src/chrome/locale/is/aboutDialog.dtd               | 19 ++++++
 src/chrome/locale/is/aboutTBUpdate.dtd             |  6 ++
 src/chrome/locale/is/aboutTor.dtd                  | 54 +++++-----------
 src/chrome/locale/is/aboutTor.properties           | 19 ++++--
 src/chrome/locale/is/brand.dtd                     | 15 +++--
 src/chrome/locale/is/brand.properties              | 17 ++---
 src/chrome/locale/is/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/is/torbutton.dtd                 | 65 +++++++++++++------
 src/chrome/locale/is/torbutton.properties          | 67 +++++++++++++------
 src/chrome/locale/it/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/it/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/it/torbutton.properties          |  6 +-
 src/chrome/locale/ja/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/ja/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/ko/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/ko/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/nb/aboutDialog.dtd               | 19 ++++++
 src/chrome/locale/nb/aboutTBUpdate.dtd             |  6 ++
 src/chrome/locale/nb/aboutTor.dtd                  | 54 +++++-----------
 src/chrome/locale/nb/aboutTor.properties           | 19 ++++--
 src/chrome/locale/nb/brand.dtd                     | 15 +++--
 src/chrome/locale/nb/brand.properties              | 17 ++---
 src/chrome/locale/nb/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/nb/torbutton.dtd                 | 51 +++++++++++----
 src/chrome/locale/nb/torbutton.properties          | 63 +++++++++++++-----
 src/chrome/locale/nl/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/nl/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/nl/torbutton.dtd                 |  4 +-
 src/chrome/locale/nl/torbutton.properties          |  4 +-
 src/chrome/locale/pl/aboutTor.dtd                  | 44 ++++---------
 src/chrome/locale/pl/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/pt-BR/aboutTor.dtd               | 42 ++++--------
 .../locale/pt-BR/browserOnboarding.properties      | 38 +++++++++++
 src/chrome/locale/pt-BR/torbutton.properties       | 14 ++--
 src/chrome/locale/ru/aboutTor.dtd                  | 43 ++++---------
 src/chrome/locale/ru/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/ru/torbutton.properties          |  4 +-
 src/chrome/locale/sv/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/sv/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/tr/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/tr/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/tr/torbutton.dtd                 |  2 +-
 src/chrome/locale/vi/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/vi/aboutTor.properties           |  2 +-
 src/chrome/locale/vi/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/vi/torbutton.dtd                 | 26 ++++----
 src/chrome/locale/vi/torbutton.properties          |  8 +--
 src/chrome/locale/zh-CN/aboutTor.dtd               | 42 ++++--------
 .../locale/zh-CN/browserOnboarding.properties      | 38 +++++++++++
 src/chrome/locale/zh-TW/aboutTor.dtd               | 42 ++++--------
 .../locale/zh-TW/browserOnboarding.properties      | 38 +++++++++++
 src/chrome/locale/zh-TW/torbutton.dtd              |  4 +-
 src/chrome/locale/zh-TW/torbutton.properties       |  6 +-
 114 files changed, 2121 insertions(+), 1176 deletions(-)

diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd
index 86fe2cd2..6a71cdd9 100644
--- a/src/chrome/locale/ar/aboutTor.dtd
+++ b/src/chrome/locale/ar/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Ø¹Ù? ØªÙ?Ø±">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "ØªØØ°Ù?Ø±: Ù?Ø°Ù? Ù?Ø³Ø®Ø© Ù?Ø¯Ù?Ù?Ø© Ù?Ù? Ø§Ù?Ù?ØªØµÙ?Ø.">
-<!ENTITY aboutTor.outOfDateTorOff.label "Ø£Ù?Ø¶Ø§Ù?Ø? Ù?Ø°Ù? Ù?Ø³Ø®Ø© Ù?Ø¯Ù?Ù?Ø© Ù?Ù? Ø§Ù?Ù?ØªØµÙ?Ø.">
-<!ENTITY aboutTor.outOfDate2.label "Ø§Ø¶ØºØ· Ø¹Ù?Ù? Ø±Ù?Ø² Ø§Ù?Ø¨ØµÙ?Ø© Ø«Ù? Ø§Ø®ØªØ± &quot;ØªØÙ?Ù? Ù?Ù? ØªØØ¯Ù?Ø«Ø§Øª Ù?ØªØµÙ?Ø ØªÙ?Ø±&quot;">
-
-<!ENTITY aboutTor.check.label "Ø§Ø®ØªØ¨Ø± Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø´Ø¨Ù?Ø© ØªÙ?Ø±.">
-
-<!ENTITY aboutTor.success.label "Ø£Ù?Ù?Ø§Ù? Ø¨Ù? Ù?Ù? Ù?ØªØµÙ?Ø ØªÙ?Ø±">
-<!ENTITY aboutTor.success2.label "Ù?ØªØµÙ? Ø¨Ø´Ø¨Ù?Ø© ØªÙ?Ø±">
-<!ENTITY aboutTor.success3.label "Ù?Ù?Ù?Ù?Ù? Ø§Ù?Ø¢Ù? ØªØµÙ?Ø Ø§Ù?Ø§Ù?ØªØ±Ù?Øª Ø¨Ø´Ù?Ù? Ù?ØÙ?Ù? Ù?Ù?Ù?ØªÙ?.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "ØØ¯Ø« Ø®Ø·Ø£ Ù?Ø§!">
 <!ENTITY aboutTor.failure2.label "ØªÙ?Ø± Ù?Ø§ Ù?Ø¹Ù?Ù? Ù?Ù? Ù?Ø°Ø§ Ø§Ù?Ù?ØªØµÙ?Ø.">
 
-<!ENTITY aboutTor.search.label "Ø¨ØØ«">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!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.torbrowser_user_manual_questions.label "Ø£Ù?Ø© Ø£Ø³Ø¦Ù?Ø©Ø?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "Ø³">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Ø¯Ù?Ù?Ù? Ø§Ø³ØªØ®Ø¯Ø§Ù? Ù?ØªØµÙ?Ù?Ø ØªÙ?Ø±">
-<!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 "ØªØ¨Ø±Ø¹ Ø¨Ø®Ø¯Ù?Ø§ØªÙ? Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "ØªØ¨Ø±Ø¹ Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "Ù?Ø´Ø±Ù?Ø¹ ØªÙ?Ø± Ù?Ù? Ù?Ø´Ø±Ù?Ø¹ ØºÙ?Ø± Ø±Ø¨ØÙ? (ØØ³Ø¨ US 501(c)(3)) Ù?Ù?Ù?Ø±Ø³ Ù?Ù?Ø¨ØØ«Ø? Ù?Ø§Ù?ØªØ·Ù?Ù?Ø±Ø? Ù?Ø§Ù?ØªÙ?Ø¹Ù?Ø© ØÙ?Ù? Ù?Ù?Ø¶Ù?Ø¹ Ø¥Ø®Ù?Ø§Ø¡ Ø§Ù?Ù?Ù?Ù?Ø© Ù?Ø§Ù?Ø®ØµÙ?ØµÙ?Ø©.">
-<!ENTITY aboutTor.learnMore.label "Ø§Ù?Ø±Ø£ Ø§Ù?Ù?Ø²Ù?Ø¯ Ø¹Ù? Ù?Ø´Ø±Ù?Ø¹ ØªÙ?Ø± Â»">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/ar/browserOnboarding.properties b/src/chrome/locale/ar/browserOnboarding.properties
new file mode 100644
index 00000000..6910fd7b
--- /dev/null
+++ b/src/chrome/locale/ar/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Ù?Ø±ØØ¨Ø§Ù?
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Ø§Ù?Ø®ØµÙ?ØµÙ?Ø©
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Ø¥Ù?ØªØ´Ø§Ù?
+
+onboarding.tour-tor-security=Ø§Ù?Ø£Ù?Ø§Ù?
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Ø®Ø¯Ù?Ø§Øª Ø§Ù?Ø¨ØµÙ?Ø© (Onion)
+onboarding.tour-tor-onion-services.title=Ø®Ø¯Ù?Ø§Øª Ø§Ù?Ø¨ØµÙ?Ø© (Onion)
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties
index 815004f9..5dd4c283 100644
--- a/src/chrome/locale/ar/torbutton.properties
+++ b/src/chrome/locale/ar/torbutton.properties
@@ -54,5 +54,5 @@ profileAccessDenied=Ù?Ø§ Ù?Ù?ØªÙ?Ù? %S Ø§Ù?ØµÙ?Ø§ØÙ?Ø§Øª Ø§Ù?Ù?Ø·Ù?Ù?Ø¨Ø© Ù?Ù?
 profileMigrationFailed=Ù?Ø´Ù? Ù?Ù?Ù? Ù?Ù?Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª %S Ø§Ù?Ù?Ù?Ø¬Ù?Ø¯ Ø¥Ù?Ù? Ø§Ù?Ø¥ØµØ¯Ø§Ø±Ø© Ø§Ù?Ø¬Ø¯Ù?Ø¯Ø©.\nØ³Ù?Ø³ØªØ®Ø¯Ù? Ù?Ù?Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø¬Ø¯Ù?Ø¯.
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=Ø§Ù?Ø§ØªØµØ§Ù? Ù?Ø¹Ù?Ù? (Ø®Ø¯Ù?Ø© Ø¨ØµÙ?Ø©Ø? %1$SØ? Ù?Ù?Ø§ØªÙ?Ø %2$S Ø¨ØªØ©Ø? %3$S)
+pageInfo_OnionEncryption=Ø§Ù?Ø§ØªØµØ§Ù? Ù?Ø¹Ù?Ù? (Ø®Ø¯Ù?Ø© Ø¨ØµÙ?Ø©)
diff --git a/src/chrome/locale/bn-BD/aboutTor.dtd b/src/chrome/locale/bn-BD/aboutTor.dtd
index f9226bf1..dffca8a8 100644
--- a/src/chrome/locale/bn-BD/aboutTor.dtd
+++ b/src/chrome/locale/bn-BD/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Tor à¦¸à¦®à§?à¦ªà¦°à§?à¦?à§?">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "à¦¸à¦¤à¦°à§?à¦?à¦¤à¦¾: à¦?à¦? à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à¦?à¦¿ à¦ªà§?à¦°à¦¾à¦¨à§?à¥¤">
-<!ENTITY aboutTor.outOfDateTorOff.label "à¦?à¦?à¦¾à¦¡à¦¼à¦¾à¦?, à¦?à¦? à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à¦?à¦¿à¦? à¦ªà§?à¦°à¦¾à¦¨à§?à¥¤">
-<!ENTITY aboutTor.outOfDate2.label "Onion à¦?à¦° à¦?à¦ªà¦° à¦?à§?à¦²à¦¿à¦? à¦?à¦°à§?à¦¨ à¦?à¦¬à¦? à¦¤à¦¾à¦°à¦ªà¦° à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦?à¦ªà¦¡à§?à¦? à¦?à¦¨à§?à¦¯ à¦?à§?à¦? à¦¨à¦¿à¦°à§?à¦¬à¦¾à¦?à¦¨ à¦?à¦°à§?à¦¨à¥¤">
-
-<!ENTITY aboutTor.check.label "à¦?à¦° à¦¨à§?à¦?à¦?à¦¯à¦¼à¦¾à¦°à§?à¦? à¦¸à§?à¦?à¦¿à¦?à¦¸ à¦?à§?à¦¸à§?à¦?Â  à¦?à¦°à§?à¦¨">
-
-<!ENTITY aboutTor.success.label "à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§? à¦¸à§?à¦¬à¦¾à¦?à¦¤à¦®">
-<!ENTITY aboutTor.success2.label "à¦?à¦° à¦¨à§?à¦?à¦?à¦¯à¦¼à¦¾à¦°à§?à¦?à§? à¦¸à¦?à¦¯à§?à¦?à§?à¦¤">
-<!ENTITY aboutTor.success3.label "à¦?à¦ªà¦¨à¦¿ à¦?à¦?à¦¨ à¦¨à¦¿à¦°à¦¾à¦ªà¦¦à§? à¦?à¦¨à§?à¦?à¦¾à¦°à¦¨à§?à¦? à¦¬à§?à¦°à¦¾à¦?à¦? à¦?à¦°à¦¤à§? à¦ªà¦¾à¦°à¦¬à§?à¦¨à¥¤">
+<!ENTITY aboutTor.ready.label "à¦?à¦?à§?à¦¸à¦ªà§?à¦²à§?à¦°. à¦?à§?à¦ªà¦¨à§?.">
+<!ENTITY aboutTor.ready2.label "à¦?à¦ªà¦¨à¦¿ à¦¬à¦¿à¦¶à§?à¦¬à§?à¦° à¦¸à¦¬à¦?à§?à¦¯à¦¼à§? à¦¬à§?à¦¯à¦?à§?à¦¤à¦¿à¦?à¦¤ à¦¬à§?à¦°à¦¾à¦?à¦?à¦¿à¦? à¦?à¦à¦¿à¦?à§?à¦?à¦¤à¦¾à¦° à¦?à¦¨à§?à¦¯ à¦ªà§?à¦°à¦¸à§?à¦¤à§?à¦¤ à¥¤">
 <!ENTITY aboutTor.failure.label "à¦?à¦¿à¦?à§? à¦à§?à¦² à¦¹à¦¯à¦¼à§?à¦?à§?!">
 <!ENTITY aboutTor.failure2.label "à¦?à¦° à¦?à¦? à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§? à¦?à¦¾à¦? à¦?à¦°à¦?à§? à¦¨à¦¾">
 
-<!ENTITY aboutTor.search.label "à¦?à§?à¦?à§?à¦¨">
+<!ENTITY aboutTor.search.label "DuckDuckGo à¦¸à¦?à§?à¦?à§? à¦?à¦¨à§?à¦¸à¦¨à§?à¦§à¦¾à¦¨">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!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.torbrowser_user_manual_questions.label "à¦ªà§?à¦°à¦¶à§?à¦¨?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "à¦?à¦®à¦¾à¦¦à§?à¦° à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§?à¦° à¦®à§?à¦¯à¦¾à¦¨à§?à¦¯à¦¼à¦¾à¦² à¦ªà¦°à§?à¦?à§?à¦·à¦¾ à¦?à¦°à§?à¦¨Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦?à¦?à¦?à¦¾à¦° à¦®à§?à¦¯à¦¾à¦¨à§?à¦¯à¦¼à¦¾à¦²">
-<!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 "à¦?à¦ªà¦¨à¦¾à¦° à¦ªà¦°à¦¿à¦·à§?à¦¬à¦¾à¦?à§?à¦²à¦¿ à¦¸à§?à¦¬à§?à¦?à§?à¦?à¦¾à¦¸à§?à¦¬à¦? Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "à¦¦à¦¾à¦¨ à¦?à¦°à§?à¦¨ Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "à¦?à¦®à¦¾à¦¦à§?à¦° à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§?à¦° à¦®à§?à¦¯à¦¾à¦¨à§?à¦¯à¦¼à¦¾à¦² à¦ªà¦°à§?à¦?à§?à¦·à¦¾ à¦?à¦°à§?à¦¨Â»">
 
-<!ENTITY aboutTor.footer.label "à¦?à¦° à¦ªà§?à¦°à¦?à¦²à§?à¦ªà¦?à¦¿ à¦®à¦¾à¦°à§?à¦?à¦¿à¦¨ à¦¯à§?à¦?à§?à¦¤à¦°à¦¾à¦·à§?à¦?à§?à¦°à§?à¦° 501 (à¦¸à¦¿) (3) à¦?-à¦²à¦¾à¦à¦?à¦¨à¦? à¦?à¦¬à§?à¦·à¦£à¦¾, à¦?à¦¨à§?à¦¨à¦¯à¦¼à¦¨ à¦?à¦¬à¦? à¦?à¦¨à¦²à¦¾à¦?à¦¨ à¦?à§?à¦ªà¦¨à§?à¦¯à¦¼à¦¤à¦¾ à¦?à¦¬à¦? à¦?à§?à¦ªà¦¨à§?à¦¯à¦¼à¦¤à¦¾à¦° à¦¶à¦¿à¦?à§?à¦·à¦¾à¥¤">
-<!ENTITY aboutTor.learnMore.label "Tor à¦ªà§?à¦°à¦?à¦²à§?à¦ª à¦¸à¦®à§?à¦ªà¦°à§?à¦?à§? à¦?à¦°à¦? à¦?à¦¾à¦¨à§?à¦¨ Â»">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "à¦?à¦° à¦ªà§?à¦°à¦?à¦²à§?à¦ªà¦?à¦¿ à¦?à¦?à¦?à¦¿ à¦®à¦¾à¦°à§?à¦?à¦¿à¦¨ 501 (c) (3) à¦?à¦²à¦¾à¦à¦?à¦¨à¦? à¦ªà§?à¦°à¦¤à¦¿à¦·à§?à¦ à¦¾à¦¨, à¦®à¦¾à¦¨à¦¬à¦¾à¦§à¦¿à¦?à¦¾à¦° à¦?à¦¬à¦? à¦®à§?à¦?à§?à¦¤ à¦?à¦¬à¦? à¦?à¦¨à§?à¦®à§?à¦?à§?à¦¤ à¦?à§?à¦¸ à¦¸à¦¨à¦¦à§? à¦?à¦¬à¦? à¦?à§?à¦ªà¦¨à§?à¦¯à¦¼à¦¤à¦¾ à¦ªà§?à¦°à¦¯à§?à¦?à§?à¦¤à¦¿à¦?à§? à¦¸à¦®à¦°à§?à¦¥à¦¨ à¦?à¦°à§?, à¦¤à¦¾à¦¦à§?à¦° à¦¨à¦¿à¦·à¦¿à¦¦à§?à¦§ à¦¸à¦¹à¦?à¦²à¦à§?à¦¯à¦¤à¦¾ à¦?à¦¬à¦? à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦° à¦?à¦¬à¦? à¦¤à¦¾à¦¦à§?à¦° à¦¬à§?à¦?à§?à¦?à¦¾à¦¨à¦¿à¦? à¦? à¦?à¦¨à¦ªà§?à¦°à¦¿à¦¯à¦¼ à¦¬à§?à¦?à¦¾à¦ªà¦¡à¦¼à¦¾ à¥¤">
+<!ENTITY aboutTor.getInvolved.label "à¦¯à§?à¦?à§?à¦¤ à¦¹à§?à¦¨Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/bn-BD/browserOnboarding.properties b/src/chrome/locale/bn-BD/browserOnboarding.properties
new file mode 100644
index 00000000..aaf75ba1
--- /dev/null
+++ b/src/chrome/locale/bn-BD/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=à¦?à§?à¦ªà¦¨à§?à¦¯à¦¼à¦¤à¦¾
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=Security
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion à¦¸à§?à¦¬à¦¾
+onboarding.tour-tor-onion-services.title=Onion à¦¸à§?à¦¬à¦¾
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/bn-BD/torbutton.dtd b/src/chrome/locale/bn-BD/torbutton.dtd
index 98b928cc..201f3111 100644
--- a/src/chrome/locale/bn-BD/torbutton.dtd
+++ b/src/chrome/locale/bn-BD/torbutton.dtd
@@ -47,5 +47,5 @@
 <!ENTITY torbutton.prefs.sec_limit_typography "à¦?à¦¿à¦?à§? à¦«à¦¨à§?à¦? à¦?à¦¬à¦? à¦?à¦£à¦¿à¦¤ à¦?à¦¿à¦¹à§?à¦¨ à¦?à¦?à§?à¦·à¦® à¦?à¦?à§?à¥¤">
 <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "à¦?à¦¿à¦?à§? à¦«à¦¨à§?à¦?, à¦?à¦?à¦?à¦¨, à¦?à¦£à¦¿à¦¤ à¦ªà§?à¦°à¦¤à§?à¦? à¦?à¦¬à¦? à¦?à¦¬à¦¿ à¦?à¦?à§?à¦·à¦® à¦°à¦¯à¦¼à§?à¦?à§?à¥¤">
 <!ENTITY torbutton.prefs.sec_click_to_play_media "à¦?à¦¡à¦¿à¦? à¦?à¦¬à¦? à¦à¦¿à¦¡à¦¿à¦? (HTML5 à¦®à¦¿à¦¡à¦¿à¦¯à¦¼à¦¾) à¦?à§?à¦²à¦¿à¦?-à¦?à§?-à¦?à§?à¦²à¦¾à¥¤">
-<!ENTITY torbutton.circuit_display.title "Tor Circuit">
-<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site">
+<!ENTITY torbutton.circuit_display.title "à¦?à¦° à¦¸à¦¾à¦°à§?à¦?à¦¿à¦?">
+<!ENTITY torbutton.circuit_display.new_circuit "à¦?à¦? à¦¸à¦¾à¦?à¦?à§?à¦° à¦?à¦¨à§?à¦¯ à¦¨à¦¤à§?à¦¨ à¦¸à¦¾à¦°à§?à¦?à¦¿à¦?">
diff --git a/src/chrome/locale/bn-BD/torbutton.properties b/src/chrome/locale/bn-BD/torbutton.properties
index 377fd910..45634d87 100644
--- a/src/chrome/locale/bn-BD/torbutton.properties
+++ b/src/chrome/locale/bn-BD/torbutton.properties
@@ -2,11 +2,11 @@ torbutton.circuit_display.internet = à¦?à¦¨à§?à¦?à¦¾à¦°à¦¨à§?à¦?à§?à¦°
 torbutton.circuit_display.ip_unknown = à¦?à¦?à¦ªà¦¿ à¦?à¦?à¦¾à¦¨à¦¾
 torbutton.circuit_display.onion_site = à¦?à¦¨à¦¿à¦?à¦¨ à¦¸à¦¾à¦?à¦?
 torbutton.circuit_display.this_browser = à¦?à¦? à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°
-torbutton.circuit_display.relay = Relay
+torbutton.circuit_display.relay = à¦°à¦¿à¦²à§?à¦?
 torbutton.circuit_display.tor_bridge = à¦¬à§?à¦°à¦¿à¦?
 torbutton.circuit_display.unknown_country = à¦?à¦?à¦¾à¦¨à¦¾ à¦¦à§?à¦¶
-torbutton.circuit_display.guard = Guard
-torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+torbutton.circuit_display.guard = à¦?à¦¾à¦°à§?à¦¡
+torbutton.circuit_display.guard_note = à¦?à¦ªà¦¨à¦¾à¦° [à¦?à¦¾à¦°à§?à¦¡] à¦¨à§?à¦¡ à¦ªà¦°à¦¿à¦¬à¦°à§?à¦¤à¦¨ à¦¹à¦¤à§? à¦ªà¦¾à¦°à§? à¦¨à¦¾à¥¤
 torbutton.circuit_display.learn_more = à¦?à¦°à¦? à¦?à¦¾à¦¨à§?à¦¨
 torbutton.content_sizer.margin_tooltip = à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦?à¦¨à§?à¦¡à§? à¦ªà§?à¦°à¦¸à§?à¦¥ à¦?à¦¬à¦? à¦?à¦?à§?à¦?à¦¤à¦¾ à¦¨à¦¿à¦?à§?à¦?à¦¤ à¦?à¦°à¦¤à§? à¦?à¦? à¦®à¦¾à¦°à§?à¦?à¦¿à¦¨ à¦¯à§?à¦? à¦?à¦°à§?, à¦?à¦¬à¦? à¦?à¦?à¦à¦¾à¦¬à§? à¦®à¦¾à¦¨à§?à¦· à¦?à¦ªà¦¨à¦¾à¦?à§? à¦?à¦¨à¦²à¦¾à¦?à¦¨ à¦?à§?à¦°à§?à¦¯à¦¾à¦? à¦?à¦°à¦¾à¦° à¦?à§?à¦·à¦®à¦¤à¦¾ à¦¹à§?à¦°à¦¾à¦¸ à¦?à¦°à§?à¥¤
 torbutton.panel.tooltip.disabled = à¦?à¦° à¦¸à¦?à§?à¦°à¦¿à¦¯à¦¼ à¦?à¦°à¦¤à§? à¦?à§?à¦²à¦¿à¦? à¦?à¦°à§?à¦¨
@@ -54,5 +54,5 @@ profileAccessDenied=%S à¦ªà§?à¦°à§?à¦«à¦¾à¦?à¦²à¦?à¦¿ à¦?à§?à¦¯à¦¾à¦?à§?à¦¸à§?
 profileMigrationFailed=à¦?à¦ªà¦¨à¦¾à¦° à¦¬à¦¿à¦¦à§?à¦¯à¦®à¦¾à¦¨ %S à¦ªà§?à¦°à§?à¦«à¦¾à¦?à¦²à§? à¦¸à§?à¦¥à¦¾à¦¨à¦¾à¦¨à§?à¦¤à¦° à¦¬à§?à¦¯à¦°à§?à¦¥ à¦¹à¦¯à¦¼à§?à¦?à§?à¥¤\nà¦¨à¦¤à§?à¦¨ à¦¸à§?à¦?à¦¿à¦?à¦¸ à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦° à¦?à¦°à¦¾ à¦¹à¦¬à§?à¥¤
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=à¦¸à¦?à¦¯à§?à¦? à¦?à¦¨à¦?à§?à¦°à¦¿à¦ªà§?à¦?  (Onion Service, %1$S, %2$S bit keys, %3$S)
+pageInfo_OnionEncryption=à¦¸à¦?à¦¯à§?à¦? à¦?à¦¨à¦?à§?à¦°à¦¿à¦ªà§?à¦? (Onion Service)
diff --git a/src/chrome/locale/ca/aboutDialog.dtd b/src/chrome/locale/ca/aboutDialog.dtd
new file mode 100644
index 00000000..4ab33f91
--- /dev/null
+++ b/src/chrome/locale/ca/aboutDialog.dtd
@@ -0,0 +1,19 @@
+<!ENTITY project.start           "&brandShortName; Ã©s desenvolupat per">
+<!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
+<!ENTITY project.tpoLink         "El &vendorShortName;">
+<!ENTITY project.end             ", un treball sense Ã nim de lucre per defensar la privacitat i llibertat virtual.">
+
+<!ENTITY help.start              "Vols ajudar?">
+<!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://www.torproject.org/donate/donate.html.en -->
+<!ENTITY help.donateLink         "Fes una donaciÃ³">
+<!ENTITY help.or                 "o">
+<!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en -->
+<!ENTITY help.getInvolvedLink    "Forma'n part">
+<!ENTITY help.end                "!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en -->
+<!ENTITY bottomLinks.questions   "Preguntes?">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/getinvolved/relays -->
+<!ENTITY bottomLinks.grow        "Ajuda la xarxa Tor a crÃ©ixer!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
+<!ENTITY bottomLinks.license  "InformaciÃ³ de la llicÃ¨ncia">
+<!ENTITY tor.TrademarkStatement   "'Tor' i 'Onion Logo' sÃ³n marques registrades per Tor Project, Inc.">
diff --git a/src/chrome/locale/ca/aboutTBUpdate.dtd b/src/chrome/locale/ca/aboutTBUpdate.dtd
new file mode 100644
index 00000000..515e1e79
--- /dev/null
+++ b/src/chrome/locale/ca/aboutTBUpdate.dtd
@@ -0,0 +1,6 @@
+<!ENTITY aboutTBUpdate.title "ActualitzaciÃ³ del navegador Tor">
+<!ENTITY aboutTBUpdate.updated "El navegador Tor s'ha actualitzat. ">
+<!ENTITY aboutTBUpdate.linkPrefix "Per la informaciÃ³ mÃ©s actualitzada sobre aquesta versiÃ³,">
+<!ENTITY aboutTBUpdate.linkLabel  "visiteu el lloc web">
+<!ENTITY aboutTBUpdate.linkSuffix ".">
+<!ENTITY aboutTBUpdate.changeLogHeading "Registre de canvis:">
diff --git a/src/chrome/locale/ca/aboutTor.dtd b/src/chrome/locale/ca/aboutTor.dtd
index 9f14022b..3adff326 100644
--- a/src/chrome/locale/ca/aboutTor.dtd
+++ b/src/chrome/locale/ca/aboutTor.dtd
@@ -1,47 +1,25 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Quant a 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.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
+<!ENTITY aboutTor.failure.label "Hi ha algun error.">
+<!ENTITY aboutTor.failure2.label "Tor no funciona en aquest navegador.">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.success.label "Congratulations!">
-<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
-<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
-<!ENTITY aboutTor.failure.label "Something Went Wrong!">
-<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
-<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Preguntes?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
+<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search";>
-<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
-
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
-<!ENTITY aboutTor.torInfo3.label "Exit Node:">
-<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
-<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
-<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
-<!ENTITY aboutTor.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.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.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/ca/aboutTor.properties b/src/chrome/locale/ca/aboutTor.properties
index 02088f01..169ac01c 100644
--- a/src/chrome/locale/ca/aboutTor.properties
+++ b/src/chrome/locale/ca/aboutTor.properties
@@ -2,14 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+aboutTor.searchDDG.privacy=Cerca <a href="%1$S">de forma segura</a> amb <a href="%2$S">DuckDuckGo</a>.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.donationBanner.donate=Fes una donaciÃ³ ara!
+
+aboutTor.donationBanner.slogan=Tor: Potenciant la resistÃ¨ncia digital
+aboutTor.donationBanner.mozilla=Dona avui i Mozilla us recompensarÃ !
+
+aboutTor.donationBanner.tagline1=Protegint periodistes, denunciants i activistes des de 2006
+aboutTor.donationBanner.tagline2=Interconectant llibertat global
+aboutTor.donationBanner.tagline3=Llibertat online
+aboutTor.donationBanner.tagline4=Fomentant la lliure expresiÃ³ global
+aboutTor.donationBanner.tagline5=Protegint la Privacitat de milions de persones cada dia
diff --git a/src/chrome/locale/ca/brand.dtd b/src/chrome/locale/ca/brand.dtd
index 59f665e8..a0ffa28e 100644
--- a/src/chrome/locale/ca/brand.dtd
+++ b/src/chrome/locale/ca/brand.dtd
@@ -2,7 +2,14 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY  brandShortName        "Tor Browser">
-<!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  brandShorterName      "Navegador Tor">
+<!ENTITY  brandShortName        "Navegador Tor">
+<!ENTITY  brandFullName         "Navegador Tor">
+<!ENTITY  vendorShortName       "Projecte Tor">
+<!ENTITY  trademarkInfo.part1   "El Firefox i els logotips del Firefox sÃ³n marques registrades de la Mozilla Foundation.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Cliqueu per carregar els complements de sistema instalÂ·lats">
+<!ENTITY plugins.installed.enable "Activa els complements">
+<!ENTITY plugins.installed.disable "Desactiva els complements">
+<!ENTITY plugins.installed.disable.tip "Clicqueu per evitar que es carreguin els complements de sistema">
diff --git a/src/chrome/locale/ca/brand.properties b/src/chrome/locale/ca/brand.properties
index f63def38..8c65dd7e 100644
--- a/src/chrome/locale/ca/brand.properties
+++ b/src/chrome/locale/ca/brand.properties
@@ -2,14 +2,15 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShortName=Tor Browser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+brandShorterName=Navegador Tor
+brandShortName=Navegador Tor
+brandFullName=Navegador Tor
+vendorShortName=Projecte Tor
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Inici de Firefox, pÃ gina d'inici amb cerca rÃ pida
+homePageImport=Importa la pÃ gina d'inici des de %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=SelecciÃ³ de pÃ gina d'inici
+homePageMigrationDescription=Trieu la pÃ gina d'inici que voleu:
 
 syncBrandShortName=Sync
diff --git a/src/chrome/locale/ca/browserOnboarding.properties b/src/chrome/locale/ca/browserOnboarding.properties
new file mode 100644
index 00000000..8f47794f
--- /dev/null
+++ b/src/chrome/locale/ca/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Privadesa
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=Seguretat
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion Services
+onboarding.tour-tor-onion-services.title=Onion Services
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd
index 1ee6378f..8bd89b77 100644
--- a/src/chrome/locale/ca/torbutton.dtd
+++ b/src/chrome/locale/ca/torbutton.dtd
@@ -1,22 +1,51 @@
 <!ENTITY torbutton.context_menu.new_identity "Nova identitat">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.new_circuit "Nou circuit Tor per a aquest lloc">
+<!ENTITY torbutton.context_menu.new_circuit_key "C">
+<!ENTITY torbutton.context_menu.preferences "ParÃ metres de seguretat...">
+<!ENTITY torbutton.context_menu.preferences.key "S">
+<!ENTITY torbutton.context_menu.networksettings "PreferÃ¨ncies de la Xarxa Tor...7">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
+<!ENTITY torbutton.context_menu.downloadUpdate "Cerca una actualitzaciÃ³ del navegador Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
-<!ENTITY torbutton.context_menu.cookieProtections "ProtecciÃ³ de les galetes">
+<!ENTITY torbutton.context_menu.cookieProtections "Proteccions de les Galetes...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Feu clic per a iniciar Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Reestableix predeterminats">
-<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
-<!ENTITY torbutton.cookiedialog.lockCol "Protected">
-<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.prefs.security_settings "ParÃ metres de seguretat del navegador Tor">
+<!ENTITY torbutton.prefs.restore_defaults "Torna a les opcions per defecte">
+<!ENTITY torbutton.prefs.custom_warning "El navegador personalitzat ha obtingut uns parÃ metres inusuals de seguretat. Per raons de privacitat i de seguretat, recomanem l'elecciÃ³ d'un nivell de seguretat per defecte.">
+<!ENTITY torbutton.cookiedialog.title "Configura proteccions de les galetes">
+<!ENTITY torbutton.cookiedialog.lockCol "Protegit">
+<!ENTITY torbutton.cookiedialog.domainCol "Allotjador">
 <!ENTITY torbutton.cookiedialog.nameCol "Nom">
-<!ENTITY torbutton.cookiedialog.pathCol "Path">
-<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
-<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
-<!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.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.cookiedialog.pathCol "CamÃ">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protegir les galetes">
+<!ENTITY torbutton.cookiedialog.removeCookie "Suprimir galetes">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Galetes sense protecciÃ³">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Suprimir totes amb protecciÃ³">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protegir noves galetes">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No protegir noves galetes">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir galetes de tercers i dades de seguiment">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Marca la casella de selecciÃ³ per prevenir caracterÃstiques d'abÃºs i seguiments al consultar un web. Les caracterÃstiques modificables son les URL blob, canals de difusiÃ³, memÃ²ria cau del navegador, galetes, favicons, capÃ§aleres HTTP Auth, enllaÃ§os de preconexiÃ³, emmagatzemament local, URL mediaSource, solÂ·licitud OCSP, SharedWorkers i tiquets TLS.">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Canviar detalls que distingeixen d'altres usuaris del navegador Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Mantingueu aquesta casella marcada per a ocultar informaciÃ³ sensible sobre vostÃ© a les pÃ gines web, tal com les capacitats de l'ordinador, la distribuciÃ³ del teclat, la localitzaciÃ³ dels connectors instalÂ·lats, la llista de connectors, el seu estat de xarxa, la orientaciÃ³ de la pantalla, el seu tamany, el zoom especÃfic per a cada lloc, els tipus de fitxer acceptats, els colors de sistema i les capacitats WebGL.">
+<!ENTITY torbutton.prefs.sec_caption "Nivell de seguretat">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "El control lliscant de seguretat permet deshabilitar caracterÃstiques del navegador que poden permetre vulnerabilitats en atemptats de furoners.">
+<!ENTITY torbutton.prefs.sec_standard_label "EstÃ ndard">
+<!ENTITY torbutton.prefs.sec_standard_description "Totes les caracterÃstiques del buscador Tor i de la pÃ gina web estan actives.">
+<!ENTITY torbutton.prefs.sec_safer_label "MÃ©s segur.">
+<!ENTITY torbutton.prefs.sec_safer_description "Desactivar les funcions del lloc web que sovint sÃ³n perilloses, pot fent que alguns llocs perden funcionalitat.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "A la configuraciÃ³ mÃ©s segura:">
+<!ENTITY torbutton.prefs.sec_safest_label "mÃ©s segur">
+<!ENTITY torbutton.prefs.sec_safest_description "NomÃ©s es permeten funcions del lloc web requerides per a llocs estÃ tics i serveis bÃ sics. Aquests canvis afecten imatges, mitjans de comunicaciÃ³ i scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "A la configuraciÃ³ mÃ©s segura:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Apreneu-ne mÃ©s">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "El JavaScript estÃ  desactivat per defecte en tots els llocs no-HTTPS">
+<!ENTITY torbutton.prefs.sec_js_disabled "El JavaScript estÃ  desactivat per defecte a tots els llocs.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Algunes fonts i sÃmbols matemÃ tics estan desactivats. ">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Algunes fonts, icones, sÃmbols matemÃ tics, i imatges estan desactivats. ">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "L'Ã udio i el vÃdeo (mitjans de comunicaciÃ³ HTML5) sÃ³n click-to-play.">
+<!ENTITY torbutton.circuit_display.title "Circuit de Tor">
+<!ENTITY torbutton.circuit_display.new_circuit " Circuit de Tor per a aquest lloc ">
diff --git a/src/chrome/locale/ca/torbutton.properties b/src/chrome/locale/ca/torbutton.properties
index 232359a2..978d6b91 100644
--- a/src/chrome/locale/ca/torbutton.properties
+++ b/src/chrome/locale/ca/torbutton.properties
@@ -1,27 +1,58 @@
-torbutton.panel.tooltip.disabled = Feu clic per a activar Tor
-torbutton.panel.tooltip.enabled = Feu clic per a desactivar Tor
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = IP desconeguda
+torbutton.circuit_display.onion_site = Lloc .onion
+torbutton.circuit_display.this_browser = Aquest navegador
+torbutton.circuit_display.relay = Repetidor
+torbutton.circuit_display.tor_bridge = Pont
+torbutton.circuit_display.unknown_country = PaÃs desconegut
+torbutton.circuit_display.guard = Guarda
+torbutton.circuit_display.guard_note = El vostre node de [Guarda] pot no canviar.
+torbutton.circuit_display.learn_more = Apreneu-ne mÃ©s
+torbutton.content_sizer.margin_tooltip = El navegador Tor afegeix aquest marge per a minorar la diferÃ¨ncia de alÃ§ada i amplada de la finestra, aixÃ² fa reduir la capacitat de rastrejar-te.
+torbutton.panel.tooltip.disabled = Feu clic per activar Tor
+torbutton.panel.tooltip.enabled = Feu clic per desactivar Tor
 torbutton.panel.label.disabled = Tor estÃ  desactivat
 torbutton.panel.label.enabled = Tor estÃ  activat
-extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.external.title = Voleu carregar els continguts externs?
-torbutton.popup.external.app = Es necessita una aplicaciÃ³ externa per a manejar:\n\n
-torbutton.popup.external.note = \n\nAvÃs: les aplicacions externes no estan adaptades a Tor per defecte i podrien revelar la vostra identitat.\n
-torbutton.popup.external.suggest = \nSi aquest arxiu no Ã©s de fiar, haurieu o bÃ© desar-lo per inspeccionar-lo desconectat o a una VM (mÃ quina virtual),\n o bÃ© considerar a usar un proxy transparent per Tor tipus Tails LiveCD o torsocks.\n
-torbutton.popup.launch = Inicia l'aplicaciÃ³
+extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton permet accedir a la configuraciÃ³ de Tor i esborrar fÃ cilment i rÃ pidament les dades privades de navegaciÃ³ per internet.
+torbutton.popup.external.title = Voleu descarregar un tipus de fitxer extern?
+torbutton.popup.external.app = Tor Browser no pot visualitzar aquest fitxer. Cal obrir-lo amb una altra aplicaciÃ³.\n\n
+torbutton.popup.external.note = Alguns tipus de fitxers poden fer que les aplicacions es connectin a Internet sense passar per Tor.\n\n
+torbutton.popup.external.suggest = Per seguretat, obriu els fitxers descarregats havent desactivat la connexiÃ³ a Internet, o fer servir un CD de sistema operatiu preconfigurat com Tails.\n
+torbutton.popup.launch = Descarrega el fitxer
 torbutton.popup.cancel = CancelÂ·la
-torbutton.popup.dontask = Inicia les aplicacions automÃ ticament
-torbutton.popup.prompted_language = Per donar-vos mÃ©s privacitat, Torbutton pot demanar la versiÃ³ en anglÃ¨s de les pÃ gines web. AixÃ² pot provocar que pÃ gines web que preferiu veure a la vostra llengua nativa siguin mostrades en anglÃ¨s.\n\nDesitjeu demanar les pÃ gines web en anglÃ¨s per una major privacitat?
-torbutton.popup.no_newnym = Torbutton no pot adjudicar-vos de forma segura una nova identitat. No disposa d'accÃ©s al Tor Control Port.\n\nEsteu usant Tor Browser Bundle?
-torbutton.title.prompt_torbrowser = Important Torbutton Information
-torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.popup.dontask = A partir d'ara, descarrega els fitxers automÃ ticament
+torbutton.popup.prompted_language = Per donar-vos mÃ©s privacitat, el Torbutton pot demanar la versiÃ³ en anglÃ¨s de les pÃ gines web. AixÃ² pot provocar que les pÃ gines web que vulgueu veure en una altra llengua siguin mostrades en anglÃ¨s.\n\nVoleu demanar les pÃ gines web en anglÃ¨s per una major privadesa?
+torbutton.popup.no_newnym = El Torbutton no pot adjudicar-vos de forma segura una nova identitat. No disposeu d'accÃ©s al Tor Control Port.\n\nEsteu usant el Tor Browser Bundle?
+torbutton.title.prompt_torbrowser = InformaciÃ³ important sobre Torbutton
+torbutton.popup.prompt_torbrowser = Torbutton Funciona de forma diferent ara: ja no el pot tancar.\n\nHem fet aquest canvi per que l'Ãºs de Torbutton en un navegador utilitzat tambÃ© per navegar fora de l'entorn de Tor ja no es segur. Hi havien moltes incidÃ¨ncies i no hem trobat cap altre soluciÃ³ per arreglar-les. \n\nSi desitja continuar utilitzant Firefox de forma habitual, ha de desinstalar Torbutton i descarregar Tor Browser Bundle. La seguretat de Tor Browser es millor que la de Firefox, fins i tot quan es fa servir Torbutton. \n\nPer desinstalar Torbutton, seleccioni Eines->Addons->Extensions and faci click sobre el botÃ³ Desinstalar al costat de Torbutton 
+torbutton.popup.short_torbrowser = InformaciÃ³ important sobre Torbutton! \n\nTorbutton ara Ã©s troba sempre activat.\n\nFaci click sobre Torbutton per mÃ©s informaciÃ³.
 
-torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.confirm_plugins = Alguns Plugins com Flash poden afectar la seva privacitat i el seu anonimat.\n\nTambÃ© poden  curt-circuitar Tor per revelar la ubicaciÃ³ actual i l'adreÃ§a IP.\n\nEstÃ  segur de voler activar aquests plugins? \n\n
 torbutton.popup.never_ask_again = No torneu a preguntar
+torbutton.popup.confirm_newnym = El navegador Tor tancarÃ  totes les finestres i pestanyes. Totes les sessions web es perdran. \n\nVol reiniciar el navegador Tor per reiniciar la seva identitat?\n\n
+
+torbutton.slider_notification = El menÃº de la ceba verda tÃ© ara un slider que li permet ajustar el seu nivell de seguretat. Fes-li un cop d'ull!
+torbutton.slider_notification_button = Obrir les preferÃ¨ncies de seguretat
+
+torbutton.maximize_warning = Maximitzar Tor Browser por permetre als llocs web determinar les dimensions del teu monitor, que pot utilitzar-se per a rastrejar-li. Li recomanem que deixe la finestra de Tor Browser amb la seva mida per defecte.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Permetre en el futur
+canvas.siteprompt=Aquest lloc web (%S) ha intentat extreure les dades de la imatge del llenÃ§ HTML5, que es poden utilitzar per identificar el seu ordinador.\n\nEl Navegador Tor hauria  de permetre que aquest lloc web extregui les dades de la imatge del llenÃ§ HTML5?
+canvas.notNow=Ara no
+canvas.notNowAccessKey=N
+canvas.allow=Permet a partir d'ara
 canvas.allowAccessKey=A
-canvas.never=Mai per aquest lloc
+canvas.never=Mai per a aquest lloc (recomanat)
 canvas.neverAccessKey=e
+
+# Profile/startup error messages. Strings are kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+profileProblemTitle=Problema en el perfil %S
+profileReadOnly=No pot executar %S des de un sistema de fitxers de nomÃ©s lectura. Si us plau, copie $S a un altra localitzaciÃ³ avanÃ§ de intentar usar-ho.
+profileReadOnlyMac=No pot executar %S des de un sistema de fitxers de nomÃ©s lectura. Si us plau, copie $S a la seva carpeta Escriptori o Aplicacions avanÃ§ de intentar usar-ho.
+profileAccessDenied=%S no tÃ© permisos per accedir al perfil. Si us plau, ajuste els permisos del seu sistema de fitxers i intente-ho de nou.
+profileMigrationFailed=La migraciÃ³ del vostre perfil %S ha fallat.\nEs fara servir una nova configuraciÃ³.
+
+# .Onion Page Info prompt.  Strings are kept here for ease of translation.
+pageInfo_OnionEncryptionWithBitsAndProtocol=ConnexiÃ³ xifrada (Onion Service, %1$S, claus de %2$S bits, %3$S)
+pageInfo_OnionEncryption=ConnexiÃ³ xifrada (Onion Service)
diff --git a/src/chrome/locale/da/aboutTBUpdate.dtd b/src/chrome/locale/da/aboutTBUpdate.dtd
index d0167c73..450e65ce 100644
--- a/src/chrome/locale/da/aboutTBUpdate.dtd
+++ b/src/chrome/locale/da/aboutTBUpdate.dtd
@@ -1,4 +1,4 @@
-<!ENTITY aboutTBUpdate.title "Tor Browser-opdatering">
+<!ENTITY aboutTBUpdate.title "Opdateringer til Tor Browser">
 <!ENTITY aboutTBUpdate.updated "Tor Browser er blevet opdateret.">
 <!ENTITY aboutTBUpdate.linkPrefix "For den mest aktuelle information om denne udgivelse,">
 <!ENTITY aboutTBUpdate.linkLabel  "BesÃ¸g vores webside">
diff --git a/src/chrome/locale/da/aboutTor.dtd b/src/chrome/locale/da/aboutTor.dtd
index 6e2679a1..9bd057c8 100644
--- a/src/chrome/locale/da/aboutTor.dtd
+++ b/src/chrome/locale/da/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Om Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "ADVARSEL: denne browser er forÃ¦ldet.">
-<!ENTITY aboutTor.outOfDateTorOff.label "Denne browser er desuden forÃ¦ldet.">
-<!ENTITY aboutTor.outOfDate2.label "Klik pÃ¥ lÃ¸get og vÃ¦lg sÃ¥ SÃ¸g efter Tor Browser-opdateringer.">
-
-<!ENTITY aboutTor.check.label "Test Tor-netvÃ¦rksindstillinger">
-
-<!ENTITY aboutTor.success.label "Velkommen til Tor Browser">
-<!ENTITY aboutTor.success2.label "Forbundet til Tor-netvÃ¦rket.">
-<!ENTITY aboutTor.success3.label "Du kan nu frit bruge internettet anonymt">
+<!ENTITY aboutTor.ready.label "Udforsk. Privat.">
+<!ENTITY aboutTor.ready2.label "Du er klar til verdenens mest private browseroplevelse.">
 <!ENTITY aboutTor.failure.label "Noget gik galt!">
 <!ENTITY aboutTor.failure2.label "Tor virker ikke i denne browser.">
 
-<!ENTITY aboutTor.search.label "SÃ¸g">
+<!ENTITY aboutTor.search.label "SÃ¸g med DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Yderligere information:">
-<!ENTITY aboutTor.torInfo2.label "Land og IP-adresse:">
-<!ENTITY aboutTor.torInfo3.label "Udgangsknudepunkt:">
-<!ENTITY aboutTor.torInfo4.label "Denne server logger ikke nogle informationer om besÃ¸gende.">
-<!ENTITY aboutTor.whatnextQuestion.label "Hvad er nÃ¦ste skridt?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor er IKKE al den sikkerhed du har brug for for at browse anonymt. Du bliver muligvis ogsÃ¥ nÃ¸dt til at Ã¦ndre nogle af dine browsingvaner for at sikre, at din identitet er sikker.">
-<!ENTITY aboutTor.whatnext.label "Tips til at vÃ¦re anonym Â»">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "SpÃ¸rgsmÃ¥l?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Tjek vores Tor Browser-manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser-brugermanual">
-<!ENTITY aboutTor.helpInfo1.label "Du kan hjÃ¦lpe!">
-<!ENTITY aboutTor.helpInfo2.label "Der er mange mÃ¥der du kan hjÃ¦lpe med at gÃ¸re Tor-netvÃ¦rket hurtigere og stÃ¦rkere:">
-<!ENTITY aboutTor.helpInfo3.label "KÃ¸r et Tor-relÃ¦knudepunkt Â»">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Tilbyd din hjÃ¦lp Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Foretag en donation Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser-manual">
 
-<!ENTITY aboutTor.footer.label "Tor-projektet er et US 501(c)(3) nonprofit-projekt dedikeret til forskning, udvikling og uddannelse af online anonymitet og privatliv.">
-<!ENTITY aboutTor.learnMore.label "LÃ¦r mere om Tor-projektet Â»">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Deltag Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/da/browserOnboarding.properties b/src/chrome/locale/da/browserOnboarding.properties
new file mode 100644
index 00000000..d94aa845
--- /dev/null
+++ b/src/chrome/locale/da/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Privatliv
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=Sikkerhed
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion-tjenester
+onboarding.tour-tor-onion-services.title=Onion-tjenester
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd
index 7936505c..694792e8 100644
--- a/src/chrome/locale/da/torbutton.dtd
+++ b/src/chrome/locale/da/torbutton.dtd
@@ -6,7 +6,7 @@
 <!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor-netvÃ¦rksindstillinger...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
-<!ENTITY torbutton.context_menu.downloadUpdate "SÃ¸g efter Tor Browser-opdatering...">
+<!ENTITY torbutton.context_menu.downloadUpdate "SÃ¸g efter opdateringer til Tor Browser...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "O">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie-beskyttelser...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
@@ -37,10 +37,10 @@
 <!ENTITY torbutton.prefs.sec_standard_description "Alle Tor Browser- og webstedsfunktionaliteter er aktiveret.">
 <!ENTITY torbutton.prefs.sec_safer_label "Mere sikker">
 <!ENTITY torbutton.prefs.sec_safer_description "Deaktiverer webstedsfunktionaliteter som ofte er farlige, hvilket kan gÃ¸re at nogle steder mister deres funktionalitet.">
-<!ENTITY torbutton.prefs.sec_safer_list_label "Ved den mere sikker indstilling:">
+<!ENTITY torbutton.prefs.sec_safer_list_label "Ved mere sikker-indstillingen:">
 <!ENTITY torbutton.prefs.sec_safest_label "Mest sikker">
 <!ENTITY torbutton.prefs.sec_safest_description "Tillader kun webstedsfunktionaliteter som krÃ¦ves til statiske steder og grundlÃ¦ggende tjenester. Ã?ndringerne pÃ¥virker billeder, medier og scripts.">
-<!ENTITY torbutton.prefs.sec_safest_list_label "Ved den sikreste indstilling:">
+<!ENTITY torbutton.prefs.sec_safest_list_label "Ved mest sikker-indstillingen:">
 <!ENTITY torbutton.prefs.sec_learn_more_label "LÃ¦r mere">
 <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript er deaktiveret pÃ¥ ikke-HTTPS steder.">
 <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript er som standard deaktiveret pÃ¥ alle steder.">
diff --git a/src/chrome/locale/da/torbutton.properties b/src/chrome/locale/da/torbutton.properties
index 12b79807..978691c4 100644
--- a/src/chrome/locale/da/torbutton.properties
+++ b/src/chrome/locale/da/torbutton.properties
@@ -1,7 +1,7 @@
-torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.internet = Internettet
 torbutton.circuit_display.ip_unknown = Ukendt IP-adresse
 torbutton.circuit_display.onion_site = LÃ¸g side
-torbutton.circuit_display.this_browser = Denne browser
+torbutton.circuit_display.this_browser = Browseren
 torbutton.circuit_display.relay = RelÃ¦
 torbutton.circuit_display.tor_bridge = Bro
 torbutton.circuit_display.unknown_country = Ukendt land
@@ -32,7 +32,7 @@ torbutton.popup.never_ask_again = SpÃ¸rg mig aldrig igen
 torbutton.popup.confirm_newnym = Tor Browser vil lukke alle vinduer og faneblade. Alle webside-sessioner vil gÃ¥ tabt.\nGenstart Tor Browser nu for at nulstille din identitet?\n
 
 torbutton.slider_notification = Nu har det grÃ¸nne lÃ¸g menuen en sikkerheds skyder som lader dig tilpasse dit sikkerhedsniveau. Tjek det ud!
-torbutton.slider_notification_button = Ã?ben sikkerhedsindstillinger
+torbutton.slider_notification_button = Ã?bn sikkerhedsindstillinger
 
 torbutton.maximize_warning = Hvis du maksimere Tor Browser kan websteder fastslÃ¥ din skÃ¦rmstÃ¸rrelse, hvilket kan blive brugt til at spore dig. Vi anbefaler at du lader Tor Browser-vinduet vÃ¦re i sin originale standardstÃ¸rrelse.
 
@@ -54,5 +54,5 @@ profileAccessDenied= %S har ikke rettigheder til at bruge profilen. Skift venlig
 profileMigrationFailed=OverfÃ¸rsel af din eksisterende %S profil fejlede.\nNye indstillinger vil blive brugt.
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=Forbindelse krypteret (lÃ¸g-tjeneste, %1$S, %2$S-bit nÃ¸gler, %3$S)
+pageInfo_OnionEncryption=Forbindelse krypteret (lÃ¸g-tjeneste)
diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd
index 8e1d77fc..a653661a 100644
--- a/src/chrome/locale/de/aboutTor.dtd
+++ b/src/chrome/locale/de/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Ã?ber Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "WARNUNG: Dieser Browser ist nicht mehr aktuell!">
-<!ENTITY aboutTor.outOfDateTorOff.label "AUSSERDEM, dieser Browser ist nicht aktuell.">
-<!ENTITY aboutTor.outOfDate2.label "Klicken Sie auf die Zwiebel und wÃ¤hlen Sie dann Suche nach Tor-Browser-Aktualisierung.">
-
-<!ENTITY aboutTor.check.label "Tor-Netzwerkeinstellungen testen">
-
-<!ENTITY aboutTor.success.label "Willkommen im Tor Browser">
-<!ENTITY aboutTor.success2.label "Mit dem Tor-Netzwerk verbunden.">
-<!ENTITY aboutTor.success3.label "Sie kÃ¶nnen jetzt anonym im Internet surfen.">
+<!ENTITY aboutTor.ready.label "Entdecken. Privat.">
+<!ENTITY aboutTor.ready2.label "Sie sind bereit fÃ¼r das privateste Browsing-Erlebnis der Welt.">
 <!ENTITY aboutTor.failure.label "Irgend etwas lief schief!">
 <!ENTITY aboutTor.failure2.label "Tor funktioniert mit diesem Browser nicht.">
 
-<!ENTITY aboutTor.search.label "Suche">
+<!ENTITY aboutTor.search.label "Mit DuckDuckGo suchen">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "ZusÃ¤tzliche Informationen:">
-<!ENTITY aboutTor.torInfo2.label "Land &amp; 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.torbrowser_user_manual_questions.label "Fragen?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Schauen Sie unser Tor-Browser-Handbuch an Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor-Browser-Benutzerhandbuch">
-<!ENTITY aboutTor.helpInfo1.label "Sie kÃ¶nnen helfen!">
-<!ENTITY aboutTor.helpInfo2.label "Es gibt viele MÃ¶glichkeiten, um das Tor-Netzwerk schneller und stÃ¤rker zu machen:">
-<!ENTITY aboutTor.helpInfo3.label "Einen Tor-Relaisknoten betreiben Â»">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Ihre Dienste bereitstellen Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Etwas spenden Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor-Browser-Handbuch">
 
-<!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 der Forschung, der Entwicklung und der Schulung zum Thema InternetanonymitÃ¤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";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Machen Sie mit Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/de/browserOnboarding.properties b/src/chrome/locale/de/browserOnboarding.properties
new file mode 100644
index 00000000..6b6c63fc
--- /dev/null
+++ b/src/chrome/locale/de/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Willkommen
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=PrivatsphÃ¤re
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Entdecken
+
+onboarding.tour-tor-security=Sicherheit
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion-Dienste
+onboarding.tour-tor-onion-services.title=Onion-Dienste
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd
index 7fbb0f1c..0b22921a 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/de/torbutton.dtd
@@ -48,5 +48,5 @@
 <!ENTITY torbutton.prefs.sec_limit_typography "Einige Schriftarten und mathematische Symbole sind deaktiviert.">
 <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Einige Schriftarten, Symbole, mathematische Symbole und Bilder sind deaktiviert.">
 <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio und Video (HTML5-Medien) mÃ¼ssen zur Wiedergabe angeklickt werden.">
-<!ENTITY torbutton.circuit_display.title "Tor Circuit">
-<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site">
+<!ENTITY torbutton.circuit_display.title "Tor Kanal">
+<!ENTITY torbutton.circuit_display.new_circuit "Neuen Kanal fÃ¼r diese Seite">
diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties
index 6564c22e..d03bb543 100644
--- a/src/chrome/locale/de/torbutton.properties
+++ b/src/chrome/locale/de/torbutton.properties
@@ -5,8 +5,8 @@ torbutton.circuit_display.this_browser = Dieser Browser
 torbutton.circuit_display.relay = Verteiler
 torbutton.circuit_display.tor_bridge = BrÃ¼cke
 torbutton.circuit_display.unknown_country = Unbekanntes Land
-torbutton.circuit_display.guard = Guard
-torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+torbutton.circuit_display.guard = WÃ¤chter
+torbutton.circuit_display.guard_note = Dein [WÃ¤chter] Knotenpunkt darf sich nicht Ã¤ndern.
 torbutton.circuit_display.learn_more = Erfahren Sie mehr
 torbutton.content_sizer.margin_tooltip = Tor Browser fÃ¼gt diese Begrenzung hinzu, um die Breite und HÃ¶he Ihres Fensters weniger einzigartig zu machen. Dadurch wird es anderen erschwert, Sie im Internet zu verfolgen.
 torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren
@@ -54,5 +54,5 @@ profileAccessDenied=%S hat keine Berechtigung um dieses Profil abzurufen. Bitte
 profileMigrationFailed=Ã?bernahme des bestehenden %S Profils ist fehlgeschlagen.\nEs werden neue Einstellungen verwendet.
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=Verbindung verschlÃ¼sselt (Onion-Dienst, %1$S, %2$S bit SchlÃ¼ssel, %3$S)
+pageInfo_OnionEncryption=Verbindung verschlÃ¼sselt (Onion-Dienst)
diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd
index 73ce9ef0..2c7494e7 100644
--- a/src/chrome/locale/es/aboutTor.dtd
+++ b/src/chrome/locale/es/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Acerca de Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "ADVERTENCIA: Este navegador no estÃ¡ actualizado.">
-<!ENTITY aboutTor.outOfDateTorOff.label "ADEMÃ?S, este navegador tampoco estÃ¡ actualizado.">
-<!ENTITY aboutTor.outOfDate2.label "Haz clic en la cebolla y selecciona Comprobar actualizaciÃ³n del Navegador Tor.">
-
-<!ENTITY aboutTor.check.label "Probar las preferencias de red Tor">
-
-<!ENTITY aboutTor.success.label "Bienvenido al Navegador Tor">
-<!ENTITY aboutTor.success2.label "Conectado a la red Tor.">
-<!ENTITY aboutTor.success3.label "Ahora es libre de navegar por Internet anÃ³nimamente.">
+<!ENTITY aboutTor.ready.label "Explora. Privadamente.">
+<!ENTITY aboutTor.ready2.label "EstÃ¡s listo para experimentar la navegaciÃ³n mÃ¡s privada del mundo.">
 <!ENTITY aboutTor.failure.label "Â¡Algo fue mal!">
 <!ENTITY aboutTor.failure2.label "Tor no estÃ¡ funcionando en este navegador.">
 
-<!ENTITY aboutTor.search.label "Buscar">
+<!ENTITY aboutTor.search.label "Buscar con DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!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 ninguna informaciÃ³n sobre los visitantes.">
-<!ENTITY aboutTor.whatnextQuestion.label "Â¿QuÃ© sigue?">
-<!ENTITY aboutTor.whatnextAnswer.label "Â¡Tor NO es todo lo que necesita para navegar anÃ³nimamente! Puede necesitar cambiar alguno de sus hÃ¡bitos de navegaciÃ³n para asegurar que su identidad permanezca segura.">
-<!ENTITY aboutTor.whatnext.label "Consejos para permenecer anÃ³nimo Â»">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Â¿Preguntas?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Comprobar nuestro Manual del Navegador Tor">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Manual de usuario del Navegador Tor Â»">
-<!ENTITY aboutTor.helpInfo1.label "Â¡Usted puede ayudar!">
-<!ENTITY aboutTor.helpInfo2.label "Hay muchas formas en que las puede ayudar a hacer la red Tor mÃ¡s rÃ¡pida y fuerte.">
-<!ENTITY aboutTor.helpInfo3.label "Ejecutar un nodo de repetidor Tor Â»">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Ofrece tus serviciosde forma voluntaria Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Realiza una donaciÃ³n Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Manual del Navegador Tor">
 
-<!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";>
+<!ENTITY aboutTor.tor_mission.label "El proyecto Tor es una organizaciÃ³n sin fines de lucro definida legalmente en EUA 501(c)(3), avanzando libertades y derechos humanos mediante la creaciÃ³n y despliegue de tecnologÃas de anonimato y privacidad sin costo y de fuente abierta, soportando su disponibilidad y uso sin restricciones y ampliando su entendimiento cientÃfico y popular.">
+<!ENTITY aboutTor.getInvolved.label "InvolÃºcrese">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/es/browserOnboarding.properties b/src/chrome/locale/es/browserOnboarding.properties
new file mode 100644
index 00000000..6b8764e4
--- /dev/null
+++ b/src/chrome/locale/es/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Bienvenido
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Privacidad
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explorar
+
+onboarding.tour-tor-security=Seguridad
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Servicios Onion
+onboarding.tour-tor-onion-services.title=Servicios Onion
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties
index 3afb1be3..9335f4df 100644
--- a/src/chrome/locale/es/torbutton.properties
+++ b/src/chrome/locale/es/torbutton.properties
@@ -2,7 +2,7 @@ torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = IP desconocida
 torbutton.circuit_display.onion_site = Sitio onion
 torbutton.circuit_display.this_browser = Este navegador
-torbutton.circuit_display.relay = Relay
+torbutton.circuit_display.relay = Repetidor
 torbutton.circuit_display.tor_bridge = Repetidor puente (bridge)
 torbutton.circuit_display.unknown_country = PaÃs desconocido
 torbutton.circuit_display.guard = ProtecciÃ³n
@@ -54,5 +54,5 @@ profileAccessDenied=%S no tiene permiso para acceder al perfil. Ajuste los permi
 profileMigrationFailed=Ha ocurrido un error en la migraciÃ³n de tu perfil %S. \nSe usarÃ¡n los nuevos ajustes.
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=ConexiÃ³n encriptada (Servicio Onion, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=ConexiÃ³n encpritada (Servicio Onion)
+pageInfo_OnionEncryptionWithBitsAndProtocol=ConexiÃ³n cifrada (Servicio Onion, %1$S, %2$S bit keys, %3$S)
+pageInfo_OnionEncryption=ConexiÃ³n cifrada (Servicio Onion)
diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd
index 3b6a11eb..3fb2f888 100644
--- a/src/chrome/locale/eu/aboutTor.dtd
+++ b/src/chrome/locale/eu/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Tori buruz">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "KONTUZ: nabigatzaile hau zaharkituta dago.">
-<!ENTITY aboutTor.outOfDateTorOff.label "BAITA, nabigatzaile hau zaharkituta dago.">
-<!ENTITY aboutTor.outOfDate2.label "Tipulan sakatu eta ondoren Tor Browser Bundlea egiaztatu hautatu">
-
-<!ENTITY aboutTor.check.label "Tor sare ezarpenak frogatu">
-
-<!ENTITY aboutTor.success.label "Ongi etorri Tor Browserera">
-<!ENTITY aboutTor.success2.label "Tor sarera konektatuta.">
-<!ENTITY aboutTor.success3.label "Aske zara orain Internet anonimotasunez nabigatzeko.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "Zerbait gaizki joan da!">
 <!ENTITY aboutTor.failure2.label "Tor ez da nabigatzaile honetan funtzionatzen ari.">
 
-<!ENTITY aboutTor.search.label "Bilatu">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Informazio gehiago:">
-<!ENTITY aboutTor.torInfo2.label "Herrialde eta IP helbidea:">
-<!ENTITY aboutTor.torInfo3.label "Irteera nodoa:">
-<!ENTITY aboutTor.torInfo4.label "Ostalari honek ez du bisitarien inguruko inolako informaziorik biltzen.">
-<!ENTITY aboutTor.whatnextQuestion.label "Eta orain zer?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor EZ da anonimoki nabigatzeko behar duzun guztia! Baliteke zure nabigatze ohitura batzuk aldatu behar izatea zure nortasuna seguru mantentzen dela ziurtatzeko.">
-<!ENTITY aboutTor.whatnext.label "Anonimo mantentzeko aholkuak Â»">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Galderarik?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual">
-<!ENTITY aboutTor.helpInfo1.label "Lagundu dezakezu!">
-<!ENTITY aboutTor.helpInfo2.label "Tor sarea bizkorragoa eta indartsuagoa egiteko hainbat modutan lagundu dezakezu:">
-<!ENTITY aboutTor.helpInfo3.label "Tor errele nodo bat exekutatu Â»">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Zure zerbitzuak bolondrestu Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Dohaintza egin Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "The Tor Project irabazi asmorik gabeko US 501(c)(3) bat da, ikerketara, garapenera, eta onlineko anonimotasuna eta pribatutasunaren hezkuntzara zuzendutakoa.">
-<!ENTITY aboutTor.learnMore.label "The Tor Projecti buruz gehiago ikasi Â»">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/eu/browserOnboarding.properties b/src/chrome/locale/eu/browserOnboarding.properties
new file mode 100644
index 00000000..9d378850
--- /dev/null
+++ b/src/chrome/locale/eu/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Pribatutasuna
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=Segurtasuna
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion Services
+onboarding.tour-tor-onion-services.title=Onion Services
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd
index 7ed77f81..92674b09 100644
--- a/src/chrome/locale/fa/aboutTor.dtd
+++ b/src/chrome/locale/fa/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Ø¯Ø±Ø¨Ø§Ø±Ù?â??Û? ØªÙ?Ø±">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "Ù?Ø´Ø¯Ø§Ø±: Ø§Û?Ù? Ù?Ø±Ù?Ø±Ú¯Ø± Ø¨Ù? Ø±Ù?Ø² Ù?Û?Ø³Øª.">
-<!ENTITY aboutTor.outOfDateTorOff.label "Ù?Ù?Ú?Ù?Û?Ù? Ù« Ø§Û?Ù? Ù?Ø±Ù?Ø±Ú¯Ø± Ù?Ø¯Û?Ù?Û? Ù?Û? Ø¨Ø§Ø´Ø¯ .">
-<!ENTITY aboutTor.outOfDate2.label "Ø±Ù?Û? Ù¾Û?Ø§Ø² Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯ Ù? Ø³Ù¾Ø³ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯ Check Ø±Ø§ Ø¨Ø±Ø§Û? Ø¨Ù? Ø±Ù?Ø² Ø±Ø³Ø§Ù?Û? Tor Browser">
-
-<!ENTITY aboutTor.check.label "ØªÙ?Ø¸Û?Ù?Ø§Øª Ø´Ø¨Ú©Ù?â??Û? ØªÙ?Ø± Ø±Ø§ Ø¨Ø±Ø±Ø³Û? Ú©Ù?Û?Ø¯">
-
-<!ENTITY aboutTor.success.label "Ø¨Ù? Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø± Ø®Ù?Ø´ Ø¢Ù?Ø¯Û?Ø¯.">
-<!ENTITY aboutTor.success2.label "Ø§ØªØµØ§Ù? Ø¨Ø§ Ø´Ø¨Ú©Ù?â??Û? ØªÙ?Ø± Ø¨Ø±Ù?Ø±Ø§Ø± Ø´Ø¯.">
-<!ENTITY aboutTor.success3.label "Ø§Ú©Ù?Ù?Ù? Ø´Ù?Ø§ Ø¨Ù? Ø·Ù?Ø± Ù?Ø§Ø´Ù?Ø§Ø³ Ø¨Ù? Ø§Û?Ù?ØªØ±Ù?Øª Ø¯Ø³ØªØ±Ø³Û? Ø¯Ø§Ø±Û?Ø¯.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "Ø®Ø·Ø§Û?Û? Ù¾Û?Ø´ Ø¢Ù?Ø¯Ù? Ø§Ø³Øª!">
 <!ENTITY aboutTor.failure2.label "ØªØ§ Ø¨Ø§ Ø§Û?Ù? Ù?Ø±Ù?Ø±Ú¯Ø± Ú©Ø§Ø± Ù?Ù?Û?â??Ú©Ù?Ø¯.">
 
-<!ENTITY aboutTor.search.label "Ø¬Ø³ØªØ¬Ù?">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!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.torbrowser_user_manual_questions.label "Ù¾Ø±Ø³Ø´Ø?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Ø±Ø§Ù?Ù?Ù?Ø§Û? Ú©Ø§Ø±Ø¨Ø±Û? Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø±">
-<!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 "Ø¯Ø§Ù?Ø·Ù?Ø¨ Ø´Ù?Ù?Ø¯ Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Ø§Ù?Ø¯Ø§ Ù?Ù?Ù?Ø¯ Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "Ù¾Ø±Ù?Ú?Ù?Ù? ØªÙ?Ø± Ø³Ø§Ø²Ù?Ø§Ù? ØºÛ?Ø± Ø§Ù?ØªÙ?Ø§Ø¹Û? Ø¢Ù?Ø±Û?Ú©Ø§Û?Û? 501(c)3 Ù?Ø®ØªØµ Ù¾Ú?Ù?Ù?Ø´, ØªÙ?Ø³Ø¹Ù? Ù? Ø¢Ù?Ù?Ø²Ø´ Ø¯Ø± Ø²Ù?Û?Ù? Ù?Ø§Ø´Ù?Ø§Ø³Û? Ù? ØØ±Û?Ù? Ø´Ø®ØµÛ? Ø¢Ù?Ù?Ø§Ù?Ù? Ù?Ø³Øª.">
-<!ENTITY aboutTor.learnMore.label "Ø§Ø·Ù?Ø§Ø¹Ø§Øª Ø¨Û?Ø´ØªØ± Ø¯Ø± Ù¾Ø±Ù?Ú?Ù?Ù? ØªÙ?Ø± Ù?Ø³Ø¨ Ù?Ù?Ù?Ø¯">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/fa/brand.properties b/src/chrome/locale/fa/brand.properties
index e9eb95f4..f5ec5a29 100644
--- a/src/chrome/locale/fa/brand.properties
+++ b/src/chrome/locale/fa/brand.properties
@@ -11,6 +11,6 @@ homePageSingleStartMain=ØµÙ?ØÙ?Ù? Firefox Start, ØµÙ?ØÙ?Ù? Ø®Ø§Ù?Ú¯Û? ØªÙ?Ø¯ 
 homePageImport=ØµÙ?ØÙ?â??Ù? Ø®Ø§Ù?Ú¯Û?ØªØ§Ù?â??Ø±Ø§ Ø§Ø² %S Ù?Ø§Ø±Ø¯ Ù?Ù?Ù?Ø¯
 
 homePageMigrationPageTitle=Ø§Ù?ØªØ®Ø§Ø¨ ØµÙ?ØÙ?Ù? Ø®Ø§Ù?Ú¯Û?
-homePageMigrationDescription=Ø¨Ù?Ø±Ù?Ø§Û?Û?Ø¯ ØµÙ?ØÙ?Ù? Ø®Ø§Ù?Ú¯Û? Ø§Ù?ØªØ®Ø§Ø¨ Ú¯Ù?Û?Ø¯:
+homePageMigrationDescription=Ù?Ø·Ù?Ø§Ù? ØµÙ?ØÙ? Ø®Ø§Ù?Ú¯Û? Ù?Ù?Ø±Ø¯ Ù?Ø¸Ø± Ø®Ù?Ø¯ Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ù?Ù?Ø§Û?Û?Ø¯:
 
 syncBrandShortName=Ù?Ù?Ú¯Ø§Ù?â?? Ø³Ø§Ø²Û?
diff --git a/src/chrome/locale/fa/browserOnboarding.properties b/src/chrome/locale/fa/browserOnboarding.properties
new file mode 100644
index 00000000..663555ad
--- /dev/null
+++ b/src/chrome/locale/fa/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Ø®Ù?Ø´ Ø¢Ù?Ø¯Û?Ø¯
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=ØØ±Û?Ù? Ø®ØµÙ?ØµÛ?
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Ú¯Ø´Øª Ù? Ú¯Ø°Ø§Ø±
+
+onboarding.tour-tor-security=Ø§Ù?Ù?Û?Øª
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Ø®Ø¯Ù?Ø§Øª Ù¾Û?Ø§Ø²Û?
+onboarding.tour-tor-onion-services.title=Ø®Ø¯Ù?Ø§Øª Ù¾Û?Ø§Ø²Û?
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd
index 61323e64..6bf62d14 100644
--- a/src/chrome/locale/fa/torbutton.dtd
+++ b/src/chrome/locale/fa/torbutton.dtd
@@ -33,12 +33,12 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "Ø³Ø·Ø Ø§Ù?Ù?Û?Øª">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
-<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_label "Ø§Ø³ØªØ§Ù?Ø¯Ø§Ø±Ø¯">
 <!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
-<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_label "Ø§Û?Ù?Ù? ØªØ± ">
 <!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
 <!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
-<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_label "Ø§Û?Ù?Ù? ØªØ±Û?Ù? ">
 <!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
 <!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
 <!ENTITY torbutton.prefs.sec_learn_more_label "Ø§Ø·Ù?Ø§Ø¹Ø§Øª Ø¨Û?Ø´ØªØ±">
diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd
index 6a551d95..66b7f11b 100644
--- a/src/chrome/locale/fr/aboutTor.dtd
+++ b/src/chrome/locale/fr/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Ã? propos de Tor ">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "AVERTISSEMENT : 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 VÃ©rifier les mises Ã  jour du Navigateur Tor.">
-
-<!ENTITY aboutTor.check.label "Tester les paramÃ¨tres du rÃ©seau Tor">
-
-<!ENTITY aboutTor.success.label "Bienvenue dans le Navigateur Tor">
-<!ENTITY aboutTor.success2.label "ConnectÃ© au rÃ©seau Tor.">
-<!ENTITY aboutTor.success3.label "Vous Ãªtes maintenant libre de naviguer anonymement sur Internet.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "Une erreur sâ??est produiteâ??!">
 <!ENTITY aboutTor.failure2.label "Tor ne fonctionne pas dans ce navigateur.">
 
-<!ENTITY aboutTor.search.label "Chercher">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Informations supplÃ©mentairesÂ :">
-<!ENTITY aboutTor.torInfo2.label "Pays &amp; adresse IPÂ :">
-<!ENTITY aboutTor.torInfo3.label "NÅ?ud de sortieÂ :">
-<!ENTITY aboutTor.torInfo4.label "Ce serveur ne journalise aucune information sur les visteurs.">
-<!ENTITY aboutTor.whatnextQuestion.label "Que faire ensuiteâ???">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor nâ??est PAS le seul outil dont vous avez besoin pour naviguer anonymementâ??! Vous aurez peut-Ãªtre Ã  changer certaines de vos habitudes de navigation pour garantir la sÃ©curitÃ© de votre identitÃ©.">
-<!ENTITY aboutTor.whatnext.label "Conseils pour rester anonymeÂ Â»">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Des questionsâ???">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "G">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Guide dâ??utilisation du Navigateur Tor">
-<!ENTITY aboutTor.helpInfo1.label "Vous pouvez aiderâ??!">
-<!ENTITY aboutTor.helpInfo2.label "Vous pouvez aider Ã  rendre le rÃ©seau Tor plus rapide et plus puissant de plusieurs faÃ§onsÂ :">
-<!ENTITY aboutTor.helpInfo3.label "Exploiter un nÅ?ud-relais 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.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "Le Projet Tor est une organisation sans but lucratif USÂ 501(c)(3) dÃ©diÃ©e Ã  la recherche, au 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";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html";>
diff --git a/src/chrome/locale/fr/browserOnboarding.properties b/src/chrome/locale/fr/browserOnboarding.properties
new file mode 100644
index 00000000..1dc86527
--- /dev/null
+++ b/src/chrome/locale/fr/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Bienvenue
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=ConfidentialitÃ©
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explorer
+
+onboarding.tour-tor-security=SÃ©curitÃ©
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Les services oignon
+onboarding.tour-tor-onion-services.title=Les services oignon
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd
index 052b0adf..65b9e7d2 100644
--- a/src/chrome/locale/fr/torbutton.dtd
+++ b/src/chrome/locale/fr/torbutton.dtd
@@ -27,7 +27,7 @@
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne pas protÃ©ger les nouveaux fichiers tÃ©moins">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les fichiers tÃ©moins tiers et les autres donnÃ©es de suivi Ã  la trace">
 <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "L">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Gardez cette case cochÃ©e pour empÃªcher que diverses fonctions du navigateur soient utilisÃ©es pour vous suivre Ã  la trace lorsque vous surfez sur le Web. Les fonctions modifiÃ©es incluent les URL de grands objets binaires, les canaux de diffusion, le cache du navigateur, les fichiers fichiers tÃ©moins, les favoricÃ´nes, les en-tÃªtes Auth HTTP, les prÃ©connexions de liens, localStorage, les URL de sources de mÃ©dias, les requÃªtes OCSP, les travailleurs Web SharedWorker, et les billets de session TLS.">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Gardez cette case cochÃ©e pour empÃªcher que diverses fonctions du navigateur soient utilisÃ©es pour vous suivre Ã  la trace quand vous surfez sur le Web. Les fonctions modifiÃ©es incluent les URL de grands objets binaires, les canaux de diffusion, le cache du navigateur, les fichiers fichiers tÃ©moins, les favoricÃ´nes, les en-tÃªtes Auth HTTP, les prÃ©connexions de liens, localStorage, les URL de sources de mÃ©dias, les requÃªtes OCSP, les travailleurs Web SharedWorker, et les billets de session TLS.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les dÃ©tails qui vous distingue dâ??autres utilisateurs du Navigateur Tor">
 <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Gardez cette case cochÃ©e pour cacher aux sites Web certaines choses qui pourraient Ãªtre uniques Ã  votre sujet, incluant les performances de votre ordinateur, lâ??agencement du clavier, les paramÃ¨tres de langue, lâ??emplacement des greffons installÃ©s, la liste des greffons installÃ©s, lâ??Ã©tat de votre rÃ©seau, lâ??orientation de lâ??Ã©cran, la taille de lâ??Ã©cran, les niveaux de zoom particuliers aux sites, les types de fichiers pris en charge, les couleurs systÃ¨me et les capacitÃ©s WebGL.">
diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties
index 00dd0ac2..919fdc8c 100644
--- a/src/chrome/locale/fr/torbutton.properties
+++ b/src/chrome/locale/fr/torbutton.properties
@@ -17,14 +17,14 @@ extensions.torbutton@xxxxxxxxxxxxxx.description = BoutonTor fournit un bouton po
 torbutton.popup.external.title = TÃ©lÃ©charger un type de fichier externeâ???
 torbutton.popup.external.app = Le Navigateur Tor ne peut pas afficher ce fichier. Il est necessaire de lâ??ouvrir avec une autre application.
 torbutton.popup.external.note = Certains types de fichiers peuvent causer des connexions Ã  lâ??Internet sans passer par Tor pour certaines applications 
-torbutton.popup.external.suggest = Par sÃ©curitÃ©, vous ne devriez ouvrir les fichiers tÃ©lÃ©chargÃ©s que lorsque vous Ãªtes hors ligne, ou en utilisant un CD autonome Tor comme Tails.\n
+torbutton.popup.external.suggest = Par sÃ©curitÃ©, vous ne devriez ouvrir les fichiers tÃ©lÃ©chargÃ©s quâ??une fois hors ligne ou en utilisant un CD autonome Tor comme Tails.\n
 torbutton.popup.launch = TÃ©lÃ©charger le fichier
 torbutton.popup.cancel = Annuler
 torbutton.popup.dontask = TÃ©lÃ©charger automatiquement Ã  partir de maintenant
 torbutton.popup.prompted_language = Pour renforcer votre anonymat, BoutonTor peut demander la version anglaise des pages Web. Les pages que vous prÃ©fÃ©rez lire dans votre langue maternelle pourraient alors sâ??afficher en anglais.\n\nVoulez-vous demander des pages Web en anglais pour amÃ©liorer votre anonymatâ???
-torbutton.popup.no_newnym = BoutonTor ne peut pas vous attribuer une nouvelle identitÃ© de faÃ§on sÃ»re. Il nâ??a pas accÃ¨s au port de contrÃ´le de Tor.\n\nUtilisez-vous lâ??offre groupÃ©e de navigation Torâ???
+torbutton.popup.no_newnym = BoutonTor ne peut pas vous attribuer une nouvelle identitÃ© de faÃ§on sÃ»re. Il nâ??a pas accÃ¨s au port de contrÃ´le de Tor.\n\nUtilisez-vous lâ??offre groupÃ©e du Navigateur Torâ???
 torbutton.title.prompt_torbrowser = Informations importantes concernant BoutonTor
-torbutton.popup.prompt_torbrowser = BoutonTor fonctionne diffÃ©remment maintenant : vous ne pouvez plus le dÃ©sactiver.\n\nNous avons effectuÃ© ce changement car il nâ??est pas sÃ©curitaire dâ??utiliser BoutonTor dans un navigateur qui est Ã©galement utiliser pour une navigation sans Tor. Trop de bogues ne pouvaient Ãªtre rÃ©glÃ©s autrement.\n\nSi vous voulez continuer Ã  utiliser Firefox normalement, vous devriez dÃ©sinstaller BoutonTor et tÃ©lÃ©charger lâ??offre groupÃ©e de navigation Tor. Les propriÃ©tÃ©s de confidentialitÃ© du Navigateur Tor sont aussi supÃ©rieures Ã  celles de Firefox, mÃªme sâ??il est utilisÃ© avec BoutonTor.\n\nPour enlever BoutonTor, allez dans Outils->Modules complÃ©mentaires->Extensions et cliquer sur Supprimer Ã  cotÃ© de BoutonTor.
+torbutton.popup.prompt_torbrowser = BoutonTor fonctionne diffÃ©remment maintenant : vous ne pouvez plus le dÃ©sactiver.\n\nNous avons effectuÃ© ce changement car il nâ??est pas sÃ©curitaire dâ??utiliser BoutonTor dans un navigateur qui est Ã©galement utiliser pour une navigation sans Tor. Trop de bogues ne pouvaient Ãªtre rÃ©glÃ©s autrement.\n\nSi vous voulez continuer Ã  utiliser Firefox normalement, vous devriez dÃ©sinstaller BoutonTor et tÃ©lÃ©charger lâ??offre groupÃ©e du Navigateur Tor. Les propriÃ©tÃ©s de confidentialitÃ© du Navigateur Tor sont aussi supÃ©rieures Ã  celles de Firefox, mÃªme sâ??il est utilisÃ© avec BoutonTor.\n\nPour enlever BoutonTor, allez dans Outils->Modules complÃ©mentaires->Extensions et cliquer sur Supprimer Ã  cotÃ© de BoutonTor.
 torbutton.popup.short_torbrowser = Informations importantes concernant BoutonTorâ??!\n\nBoutonTor est toujours activÃ© dorÃ©navant.\n\nCliquer sur BoutonTor pour plus dâ??informations.
 
 torbutton.popup.confirm_plugins = Les greffons tels que Flash peuvent nuire Ã  vos anonymat et vie privÃ©e.\n\nIls peuvent Ã©galement contourner Tor afin de rÃ©vÃ©ler votre position actuelle ainsi que votre adresse IP.\n\nÃ?tes-vous certain de vouloir activer les greffonsâ???\n\n
diff --git a/src/chrome/locale/ga/aboutDialog.dtd b/src/chrome/locale/ga/aboutDialog.dtd
new file mode 100644
index 00000000..6ad9a5ca
--- /dev/null
+++ b/src/chrome/locale/ga/aboutDialog.dtd
@@ -0,0 +1,19 @@
+<!ENTITY project.start           "TÃ¡ &brandShortName; forbartha ag">
+<!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
+<!ENTITY project.tpoLink         "&vendorShortName;">
+<!ENTITY project.end             ", eagraÃocht neamhbhrabhÃºis a chosnaÃonn do phrÃobhÃ¡ideachas agus do shaoirse ar lÃne.">
+
+<!ENTITY help.start              "Ar mhaith leat cuidiÃº linn?">
+<!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://www.torproject.org/donate/donate.html.en -->
+<!ENTITY help.donateLink         "Tabhair sÃntiÃºs airgid">
+<!ENTITY help.or                 "nÃ³">
+<!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en -->
+<!ENTITY help.getInvolvedLink    "glac pÃ¡irt">
+<!ENTITY help.end                "!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en -->
+<!ENTITY bottomLinks.questions   "Ceisteanna?">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/getinvolved/relays -->
+<!ENTITY bottomLinks.grow        "Cabhraigh linn borradh a chur faoi LÃonra Tor!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
+<!ENTITY bottomLinks.license  "CeadÃºnas">
+<!ENTITY tor.TrademarkStatement   "Is trÃ¡dmharcanna de chuid Tor Project, Inc. iad 'Tor' agus an 'Onion Logo'">
diff --git a/src/chrome/locale/ga/aboutTBUpdate.dtd b/src/chrome/locale/ga/aboutTBUpdate.dtd
new file mode 100644
index 00000000..1c4063a3
--- /dev/null
+++ b/src/chrome/locale/ga/aboutTBUpdate.dtd
@@ -0,0 +1,6 @@
+<!ENTITY aboutTBUpdate.title "NuashonrÃº BrabhsÃ¡laÃ Tor">
+<!ENTITY aboutTBUpdate.updated "NuashonraÃodh BrabhsÃ¡laÃ Tor">
+<!ENTITY aboutTBUpdate.linkPrefix "Chun teach ar an eolas is dÃ©anaÃ maidir leis an leagan seo,">
+<!ENTITY aboutTBUpdate.linkLabel  "tabhair cuairt ar Ã¡r suÃomh GrÃ©asÃ¡in">
+<!ENTITY aboutTBUpdate.linkSuffix ".">
+<!ENTITY aboutTBUpdate.changeLogHeading "Logchomhad athruithe:">
diff --git a/src/chrome/locale/ga/aboutTor.dtd b/src/chrome/locale/ga/aboutTor.dtd
index 9f14022b..fd31fd4a 100644
--- a/src/chrome/locale/ga/aboutTor.dtd
+++ b/src/chrome/locale/ga/aboutTor.dtd
@@ -1,47 +1,25 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Maidir le 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.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
+<!ENTITY aboutTor.failure.label "Chuaigh rud Ã©igin ar strae!">
+<!ENTITY aboutTor.failure2.label "NÃl Tor ag obair sa bhrabhsÃ¡laÃ seo.">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.success.label "Congratulations!">
-<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
-<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
-<!ENTITY aboutTor.failure.label "Something Went Wrong!">
-<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
-<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Ceisteanna?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
+<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search";>
-<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
-
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
-<!ENTITY aboutTor.torInfo3.label "Exit Node:">
-<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
-<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
-<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
-<!ENTITY aboutTor.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.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.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/ga/aboutTor.properties b/src/chrome/locale/ga/aboutTor.properties
index 02088f01..7db055e4 100644
--- a/src/chrome/locale/ga/aboutTor.properties
+++ b/src/chrome/locale/ga/aboutTor.properties
@@ -2,14 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+aboutTor.searchDDG.privacy=<a href="%1$S">Cuardach slÃ¡n</a> le <a href="%2$S">DuckDuckGo</a>.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.donationBanner.donate=Tabhair SÃntiÃºs Airgid Anois!
+
+aboutTor.donationBanner.slogan=Tor: Cumhacht na FrithbheartaÃochta DigitÃ
+aboutTor.donationBanner.mozilla=Tabhair sÃntiÃºs airgid inniu agus meaitseÃ¡lfaidh Mozilla Ã©!
+
+aboutTor.donationBanner.tagline1=IriseoirÃ, sceithirÃ, agus gnÃomhaÃgh Ã¡ gcosaint Ã³ 2006
+aboutTor.donationBanner.tagline2=Saoirse LÃonraithe ar fud an domhain
+aboutTor.donationBanner.tagline3=Saoirse Ar LÃne
+aboutTor.donationBanner.tagline4=Saoirse Cainte Ã¡ cothÃº ar fud an domhain
+aboutTor.donationBanner.tagline5=PrÃobhÃ¡ideachas na milliÃºn Ã¡ chosaint chuile lÃ¡
diff --git a/src/chrome/locale/ga/brand.dtd b/src/chrome/locale/ga/brand.dtd
index 59f665e8..7a8c4860 100644
--- a/src/chrome/locale/ga/brand.dtd
+++ b/src/chrome/locale/ga/brand.dtd
@@ -2,7 +2,14 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY  brandShortName        "Tor Browser">
-<!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  brandShorterName      "BrabhsÃ¡laÃ Tor">
+<!ENTITY  brandShortName        "BrabhsÃ¡laÃ Tor">
+<!ENTITY  brandFullName         "BrabhsÃ¡laÃ Tor">
+<!ENTITY  vendorShortName       "Tionscadal Tor">
+<!ENTITY  trademarkInfo.part1   "Is trÃ¡dmharcanna de chuid FondÃºireacht Mozilla 'Firefox' agus lÃ³gÃ³nna Firefox.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "CliceÃ¡il chun forlÃontÃ¡in an chÃ³rais a lÃ³dÃ¡il">
+<!ENTITY plugins.installed.enable "Cumasaigh breiseÃ¡in">
+<!ENTITY plugins.installed.disable "DÃchumasaigh breiseÃ¡in">
+<!ENTITY plugins.installed.disable.tip "CliceÃ¡il chun cosc a chur ar fhorlÃontÃ¡in an chÃ³rais">
diff --git a/src/chrome/locale/ga/brand.properties b/src/chrome/locale/ga/brand.properties
index f63def38..4f96f506 100644
--- a/src/chrome/locale/ga/brand.properties
+++ b/src/chrome/locale/ga/brand.properties
@@ -2,14 +2,15 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShortName=Tor Browser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+brandShorterName=BrabhsÃ¡laÃ Tor
+brandShortName=BrabhsÃ¡laÃ Tor
+brandFullName=BrabhsÃ¡laÃ Tor
+vendorShortName=Tionscadal Tor
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Firefox Start, leathanach baile sciobtha, le cuardach ionsuite
+homePageImport=IompÃ³rtÃ¡il do leathanach baile Ã³ %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=RoghnÃº Leathanaigh Bhaile
+homePageMigrationDescription=Roghnaigh do leathanach baile:
 
-syncBrandShortName=Sync
+syncBrandShortName=SioncronÃº
diff --git a/src/chrome/locale/ga/browserOnboarding.properties b/src/chrome/locale/ga/browserOnboarding.properties
new file mode 100644
index 00000000..1a26ba8e
--- /dev/null
+++ b/src/chrome/locale/ga/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=PrÃobhÃ¡ideachas
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=Security
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=SeirbhÃsÃ Onion
+onboarding.tour-tor-onion-services.title=SeirbhÃsÃ Onion
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/ga/torbutton.dtd b/src/chrome/locale/ga/torbutton.dtd
index d8d88e49..26c3f555 100644
--- a/src/chrome/locale/ga/torbutton.dtd
+++ b/src/chrome/locale/ga/torbutton.dtd
@@ -1,22 +1,51 @@
-<!ENTITY torbutton.context_menu.new_identity "New Identity">
+<!ENTITY torbutton.context_menu.new_identity "Aitheantas Nua">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.new_circuit "Ciorcad Nua Tor don SuÃomh seo">
+<!ENTITY torbutton.context_menu.new_circuit_key "C">
+<!ENTITY torbutton.context_menu.preferences "Socruithe SlÃ¡ndÃ¡la...">
+<!ENTITY torbutton.context_menu.preferences.key "S">
+<!ENTITY torbutton.context_menu.networksettings "Socruithe LÃonra Tor...">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
+<!ENTITY torbutton.context_menu.downloadUpdate "Lorg NuashonrÃº ar BhrabhsÃ¡laÃ Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections "CaomhnÃº FianÃ¡n...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
-<!ENTITY torbutton.cookiedialog.lockCol "Protected">
-<!ENTITY torbutton.cookiedialog.domainCol "Host">
-<!ENTITY torbutton.cookiedialog.nameCol "Name">
-<!ENTITY torbutton.cookiedialog.pathCol "Path">
-<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
-<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
-<!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.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.button.tooltip "CliceÃ¡il chun cnaipe Tor a thÃºsÃº">
+<!ENTITY torbutton.prefs.security_settings "Socruithe SlÃ¡ndÃ¡la BhrabhsÃ¡laÃ Tor">
+<!ENTITY torbutton.prefs.restore_defaults "Fill ar na RÃ©amhshocruithe">
+<!ENTITY torbutton.prefs.custom_warning "TÃ¡ socruithe slÃ¡ndÃ¡la an bhrabhsÃ¡laÃ as an ngnÃ¡th faoi lÃ¡thair, mar thoradh ar do chuid sainroghanna.  Ar chÃºiseanna slÃ¡ndÃ¡la agus prÃobhÃ¡ideachais, molaimid duit ceann de na leibhÃ©il slÃ¡ndÃ¡la rÃ©amhshocraithe a roghnÃº.">
+<!ENTITY torbutton.cookiedialog.title "Bainistigh CaomhnÃº FianÃ¡n">
+<!ENTITY torbutton.cookiedialog.lockCol "Cosanta">
+<!ENTITY torbutton.cookiedialog.domainCol "Ã?strÃomhaire">
+<!ENTITY torbutton.cookiedialog.nameCol "Ainm">
+<!ENTITY torbutton.cookiedialog.pathCol "CosÃ¡n">
+<!ENTITY torbutton.cookiedialog.protectCookie "Caomhnaigh an FianÃ¡n">
+<!ENTITY torbutton.cookiedialog.removeCookie "Scrios an FianÃ¡n">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "NÃ¡ caomhnaigh an fianÃ¡n">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Scrios iad nach bhfuil caomhnaithe">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Caomhnaigh FianÃ¡in Nua">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NÃ¡ Caomhnaigh FianÃ¡in Nua">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Cuir srian le fianÃ¡in trÃÃº pÃ¡irtÃ agus le sonraÃ lorgaireachta eile">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Coinnigh tic sa bhosca seo chun cosc a chur ar ghnÃ©ithe Ã©agsÃºla sa bhrabhsÃ¡laÃ a mbaintear mÃ-ÃºsÃ¡id astu chun do ghnÃomhaÃocht ar an nGrÃ©asÃ¡n a lorg. I measc na ngnÃ©ithe seo: blob-URLanna, cainÃ©il chraolta, taisce an bhrabhsÃ¡laÃ, fianÃ¡in, deilbhÃnÃ suÃmh, ceanntÃ¡sca HTTP Auth, rÃ©amhcheangal nascanna, stÃ³ras Ã¡itiÃºil, URLanna mediaSource, iarratais OCSP, Oibrithe Roinnte, agus ticÃ©id seisiÃºn TLS. ">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Athraigh na mionsonraÃ a dhÃ©anann idirdhealÃº Ã³ ÃºsÃ¡ideoirÃ Tor eile">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "H">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Coinnigh tic sa bhosca seo chun sonraÃ a bhaineann leatsa go pearsanta a chur i bhfolach Ã³ shuÃmh GhrÃ©asÃ¡in, mar shampla luas do rÃomhaire, leagan amach do mhÃ©archlÃ¡ir, an logchaighdeÃ¡n, an Ã¡it ina bhfuil forlÃontÃ¡in suiteÃ¡ilte, na forlÃontÃ¡in shuiteÃ¡ilte fÃ©in, stÃ¡das do lÃonra, treoshuÃomh an scÃ¡ileÃ¡in, mÃ©id an scÃ¡ileÃ¡in, leibhÃ©il zÃºmÃ¡la ar shuÃmh ar leith, cineÃ¡lacha comhaid a dtacaÃonn do bhrabhsÃ¡laÃ leo, dathanna an chÃ³rais, agus acmhainnÃ WebGL.">
+<!ENTITY torbutton.prefs.sec_caption "LeibhÃ©al SlÃ¡ndÃ¡la">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "Ligeann an SleamhnÃ¡n SlÃ¡ndÃ¡la duit gnÃ©ithe Ã¡irithe sa bhrabhsÃ¡laÃ a dhÃchumasÃº nuair is fÃ©idir le bradaÃ iad a ÃºsÃ¡id chun ionsaÃ a dhÃ©anamh ort.">
+<!ENTITY torbutton.prefs.sec_standard_label "GnÃ¡thshlÃ¡ndÃ¡il">
+<!ENTITY torbutton.prefs.sec_standard_description "Gach gnÃ© de bhrabhsÃ¡laÃ Tor agus gach gnÃ© de shuÃmh GhrÃ©asÃ¡in ar siÃºl.">
+<!ENTITY torbutton.prefs.sec_safer_label "NÃos SÃ¡bhÃ¡ilte">
+<!ENTITY torbutton.prefs.sec_safer_description "DÃchumasaÃtear gnÃ©ithe de shuÃmh atÃ¡ contÃºirteach go minic; dÃ¡ bharr seo, nÃ fheidhmeoidh gach suÃomh mar is ceart.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "Leis an rogha nÃos sÃ¡bhÃ¡ilte:">
+<!ENTITY torbutton.prefs.sec_safest_label "Is SÃ¡bhÃ¡ilte">
+<!ENTITY torbutton.prefs.sec_safest_description "NÃ cheadaÃtear ach na gnÃ©ithe atÃ¡ de dhÃth ar shuÃmh statacha agus ar bhunseirbhÃsÃ. TÃ©ann na hathruithe seo i bhfeidhm ar ÃomhÃ¡nna, ar mheÃ¡in, agus ar scripteanna.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "Leis an rogha is sÃ¡bhÃ¡ilte:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Tuilleadh eolais">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "TÃ¡ JavaScript dÃchumasaithe ar shuÃmh nach mbaineann ÃºsÃ¡id as HTTPS.">
+<!ENTITY torbutton.prefs.sec_js_disabled "TÃ¡ JavaScript dÃchumasaithe ar gach suÃomh de rÃ©ir rÃ©amhshocraithe.">
+<!ENTITY torbutton.prefs.sec_limit_typography "TÃ¡ roinnt clÃ³fhoirne agus siombailÃ matamaiticiÃºla dÃchumasaithe.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "TÃ¡ roinnt clÃ³fhoirne, deilbhÃnÃ, siombailÃ matamaiticiÃºla, agus ÃomhÃ¡nna dÃchumasaithe.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Caithfidh tÃº fuaimeanna agus fÃseÃ¡in (meÃ¡in HTML5) a chliceÃ¡il lena seinm.">
+<!ENTITY torbutton.circuit_display.title "Ciorcad Tor">
+<!ENTITY torbutton.circuit_display.new_circuit "Ciorcad Nua don SuÃomh seo">
diff --git a/src/chrome/locale/ga/torbutton.properties b/src/chrome/locale/ga/torbutton.properties
index ee5b1f95..a8e1578a 100644
--- a/src/chrome/locale/ga/torbutton.properties
+++ b/src/chrome/locale/ga/torbutton.properties
@@ -1,27 +1,58 @@
-torbutton.panel.tooltip.disabled = Click to enable Tor
-torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.label.disabled = Tor Disabled
-torbutton.panel.label.enabled = Tor Enabled
-extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.external.title = Load external content?
-torbutton.popup.external.app = An external application is needed to handle:\n\n
-torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-torbutton.popup.launch = Launch application
-torbutton.popup.cancel = Cancel
-torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.title.prompt_torbrowser = Important Torbutton Information
-torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.circuit_display.internet = An tIdirlÃon
+torbutton.circuit_display.ip_unknown = IP anaithnid
+torbutton.circuit_display.onion_site = SuÃomh Onion
+torbutton.circuit_display.this_browser = An brabhsÃ¡laÃ seo
+torbutton.circuit_display.relay = Relay
+torbutton.circuit_display.tor_bridge = Droichead
+torbutton.circuit_display.unknown_country = TÃr anaithnid
+torbutton.circuit_display.guard = Guard
+torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+torbutton.circuit_display.learn_more = Tuilleadh eolais
+torbutton.content_sizer.margin_tooltip = Cuireann BrabhsÃ¡laÃ Tor an chiumhais seo leis an bhfuinneog ionas nach mbeidh leithead agus airde na fuinneoige chomh suntasach, sa chaoi go mbÃonn sÃ© nÃos deacra do ghnÃomhaÃocht ar lÃne a lorg.
+torbutton.panel.tooltip.disabled = CliceÃ¡il le Tor a chumasÃº
+torbutton.panel.tooltip.enabled = CliceÃ¡il le Tor a dhÃchumasÃº
+torbutton.panel.label.disabled = TÃ¡ Tor DÃchumasaithe
+torbutton.panel.label.enabled = TÃ¡ Tor Cumasaithe
+extensions.torbutton@xxxxxxxxxxxxxx.description = Is fÃ©idir leat an cnaipe Tor a ÃºsÃ¡id chun Tor a chumrÃº agus do chuid sonraÃ brabhsÃ¡la prÃobhÃ¡ideacha a ghlanadh go tapa agus go hÃ©asca.
+torbutton.popup.external.title = Ã?oslÃ³dÃ¡il cineÃ¡l comhaid seachtrach?
+torbutton.popup.external.app = NÃ fÃ©idir le BrabhsÃ¡laÃ Tor an comhad seo a thaispeÃ¡int. NÃ mÃ³r duit Ã© a oscailt le feidhmchlÃ¡r eile.\n\n
+torbutton.popup.external.note = DÃ©anann feidhmchlÃ¡ir Ã¡irithe ceangal dÃreach leis an IdirlÃn gan dul trÃ Tor mar gheall ar chineÃ¡lacha comhaid Ã¡irithe.\n\n
+torbutton.popup.external.suggest = Le bheith slÃ¡n sÃ¡bhÃ¡ilte, nÃor chÃ³ir duit comhaid ÃoslÃ³dÃ¡ilte a oscailt go dtÃ go mbeidh tÃº as lÃne, nÃ³ CD Beo Tor ar nÃ³s Tails a ÃºsÃ¡id.\n
+torbutton.popup.launch = Ã?oslÃ³dÃ¡il an comhad
+torbutton.popup.cancel = Cealaigh
+torbutton.popup.dontask = Ã?oslÃ³dÃ¡il comhaid go huathoibrÃoch as seo amach
+torbutton.popup.prompted_language = Is fÃ©idir leis an gcnaipe Tor an leagan BÃ©arla de leathanaigh GhrÃ©asÃ¡in a iarraidh, chun tuilleadh prÃobhÃ¡ideachais a thabhairt duit. Leis seo i bhfeidhm, seans go bhfaighidh tÃº an leagan BÃ©arla de leathanaigh dhÃ¡theangacha ab fhearr leat a lÃ©amh i nGaeilge.\n\nAn bhfuil fonn ort leaganacha BÃ©arla a iarraidh mar sin fÃ©in?
+torbutton.popup.no_newnym = NÃl an cnaipe Tor in ann aitheantas nua a thabhairt duit go sÃ¡bhÃ¡ilte. NÃl sÃ© in ann teacht ar Phort Rialaithe Tor.\n\nAn bhfuil tÃº ag ÃºsÃ¡id Burla BrabhsÃ¡laÃ Tor?
+torbutton.title.prompt_torbrowser = Eolas TÃ¡bhachtach faoi Chnaipe Tor
+torbutton.popup.prompt_torbrowser = FeidhmÃonn an cnaipe Tor go difriÃºil anois; nÃ fÃ©idir leat Ã© a mhÃºchadh a thuilleadh.\n\nD'athraÃomar Ã© seo toisc nach bhfuil sÃ© sÃ¡bhÃ¡ilte an cnaipe Tor a ÃºsÃ¡id i mbrabhsÃ¡laÃ a ÃºsÃ¡idtear le brabhsÃ¡il lasmuigh de Tor. BhÃ an iomarca fabhtanna ann nach rabhamar in ann deisiÃº ar aon bhealach eile.\n\nMÃ¡s mian leat leanÃºint ar aghaidh le Firefox mar is gnÃ¡th, ba chÃ³ir duit an cnaipe Tor a dhÃshuiteÃ¡il agus BrabhsÃ¡laÃ Tor a ÃoslÃ³dÃ¡il. TÃ¡ na hairÃonna slÃ¡ndÃ¡la i mBrabhsÃ¡laÃ Tor i bhfad nÃos fearr nÃ¡ na cinn i ngnÃ¡th-Firefox, fiÃº nuair a ÃºsÃ¡idtear Firefox leis an gcnaipe Tor.\n\nChun an cnaipe Tor a bhaint, oscail UirlisÃ->BreiseÃ¡in->EisÃnteachtaÃ ansin cliceÃ¡il an cnaipe Bain in aice le Cnaipe Tor.
+torbutton.popup.short_torbrowser = Eolas TÃ¡bhachtach maidir leis an gCnaipe Tor!\n\nTÃ¡ an Cnaipe Tor cumasaithe i gcÃ³naÃ.\n\nCliceÃ¡il air chun tuilleadh eolais a fhÃ¡il.
 
-torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Is fÃ©idir le forlÃontÃ¡in ar nÃ³s Flash dochar a dhÃ©anamh do do phrÃobhÃ¡ideachas agus d'aitheantas a nochtadh ar lÃne.\n\nTÃ¡ siad in ann Tor a sheachaint agus an Ã¡it ina bhfuil tÃº agus do sheoladh IP a nochtadh.\n\nAn bhfuil tÃº cinnte gur mhaith leat forlÃontÃ¡in a chumasÃº?\n\n
+torbutton.popup.never_ask_again = NÃ¡ fiafraigh dÃom arÃs
+torbutton.popup.confirm_newnym = DÃºnfaidh BrabhsÃ¡laÃ Tor gach fuinneog agus gach cluaisÃn. Caillfidh tÃº gach seisiÃºn oscailte.\n\nAn bhfuil fonn ort BrabhsÃ¡laÃ Tor a atosÃº anois agus d'aitheantas a athshocrÃº?\n\n
+
+torbutton.slider_notification = Anois gheobhaidh tÃº sleamhnÃ¡n slÃ¡ndÃ¡la faoin oinniÃºn glas a ligeann duit an leibhÃ©al slÃ¡ndÃ¡la a athrÃº. Bain triail as!
+torbutton.slider_notification_button = Oscail na socruithe slÃ¡ndÃ¡la
+
+torbutton.maximize_warning = BÃonn suÃmh GhrÃ©asÃ¡in in ann mÃ©id do scÃ¡ileÃ¡in a fhÃ¡il amach nuair a uasmhÃ©adaÃonn tÃº BrabhsÃ¡laÃ Tor, rud a chabhraÃonn leo do ghnÃomhaÃocht ar lÃne a lorg. Molaimid duit fuinneoga an bhrabhsÃ¡laÃ a fhÃ¡gÃ¡il ar a mÃ©id rÃ©amhshocraithe.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=Rinne an suÃomh seo (%S) iarracht sonraÃ ÃomhÃ¡ a bhaint Ã³ chanbhÃ¡s HTML5, sonraÃ a d'fhÃ©adfaÃ a ÃºsÃ¡id chun do rÃomhaire fÃ©in a aithint.\n\nAn bhfuil fonn ort cead a thabhairt don suÃomh seo sonraÃ ÃomhÃ¡ a bhaint Ã³ chanbhÃ¡s HTML5?
+canvas.notNow=NÃl Anois
+canvas.notNowAccessKey=N
+canvas.allow=Ceadaigh amach anseo
 canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=NÃ¡ ceadaigh don suÃomh seo riamh (molta)
 canvas.neverAccessKey=e
+
+# Profile/startup error messages. Strings are kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+profileProblemTitle=Fadhb leis an bPrÃ³ifÃl %S
+profileReadOnly=NÃ fÃ©idir leat %S a rith Ã³ chÃ³ras comhad inlÃ©ite amhÃ¡in. CÃ³ipeÃ¡il %S go dtÃ suÃomh eile agus ansin bain triail eile as.
+profileReadOnlyMac=NÃ fÃ©idir leat %S a rith Ã³ chÃ³ras comhad inlÃ©ite amhÃ¡in. CÃ³ipeÃ¡il %S go dtÃ do Dheasc nÃ³ an fillteÃ¡n Applications, ansin bain triail eile as.
+profileAccessDenied=NÃl cead rochtana ag %S ar an bprÃ³ifÃl. Athraigh na ceadanna ar do chÃ³ras comhad agus bain triail eile as.
+profileMigrationFailed=NÃorbh fhÃ©idir an phrÃ³ifÃl %S atÃ¡ agat a aistriÃº.\nÃ?sÃ¡idfear socruithe nua.
+
+# .Onion Page Info prompt.  Strings are kept here for ease of translation.
+pageInfo_OnionEncryptionWithBitsAndProtocol=Ceangal Criptithe (SeirbhÃs Onion, %1$S, eochracha %2$S giotÃ¡n, %3$S)
+pageInfo_OnionEncryption=Ceangal Criptithe (SeirbhÃs Onion)
diff --git a/src/chrome/locale/he/aboutDialog.dtd b/src/chrome/locale/he/aboutDialog.dtd
index ce1bcbaa..d334bfd0 100644
--- a/src/chrome/locale/he/aboutDialog.dtd
+++ b/src/chrome/locale/he/aboutDialog.dtd
@@ -16,4 +16,4 @@
 <!ENTITY bottomLinks.grow        "×¢×?×?×¨ ×?×¨×©×ª Tor ×?×?×?×?×?!">
 <!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
 <!ENTITY bottomLinks.license  "×?×?×?×¢ ×¨×?×©×?×?">
-<!ENTITY tor.TrademarkStatement   "'Tor' ×?-'×¡×?×?×?×? ×?×?×¦×?' ×?×? ×¡×?×?× ×?×? ×?×¡×?×¨×?×?×? ×¨×©×?×?×?×? ×©×? Tor Project, Inc.">
+<!ENTITY tor.TrademarkStatement   "'Tor' ×?'×¡×?×?×?×? ×?×?×¦×?' ×?×? ×¡×?×?× ×?×? ×?×¡×?×¨×?×?×? ×¨×©×?×?×?×? ×©×? Tor Project, Inc.">
diff --git a/src/chrome/locale/he/aboutTor.dtd b/src/chrome/locale/he/aboutTor.dtd
index 819cc8e8..46f110f4 100644
--- a/src/chrome/locale/he/aboutTor.dtd
+++ b/src/chrome/locale/he/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "×?×?×?×?×ª Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "×?×?×?×¨×?: ×?×¤×?×¤×? ×?×? ×?×?× ×? ×?×¢×?×?×?×?.">
-<!ENTITY aboutTor.outOfDateTorOff.label "×?×?×? ×?×?, ×?×¤×?×¤×? ×?×? ×?×?× ×? ×?×¢×?×?×?×?.">
-<!ENTITY aboutTor.outOfDate2.label "×?×?×¥ ×¢×? ×?×?×¦×? ×?×?×? ×?×?×¨ ×?×?×?×?×§ ×?×?×¨ ×¢×?×?×?×? ×?×?×¤×?×¤×? Tor">
-
-<!ENTITY aboutTor.check.label "×?×?×? ×?×?×?×¨×?×ª ×¨×©×ª Tor">
-
-<!ENTITY aboutTor.success.label "×?×¨×?×? ×?×?×? ×?×? ×?×¤×?×¤×? Tor">
-<!ENTITY aboutTor.success2.label "×?×?×?×?×¨ ×?×? ×¨×©×ª Tor.">
-<!ENTITY aboutTor.success3.label "×?×ª×? ×¢×?×©×?×? ×?×?×¤×©×? ×?×?×?×?×© ×?×?×?× ×?×¨× ×? ×?×?×?×¤×? ×?×?×?×?× ×?.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "×?×©×?×? ×?×©×ª×?×©!">
 <!ENTITY aboutTor.failure2.label "Tor ×?×?× ×? ×¢×?×?×? ×?×?×¤×?×¤×? ×?×?.">
 
-<!ENTITY aboutTor.search.label "×?×¤×©">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!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.torbrowser_user_manual_questions.label "×©×?×?×?×ª?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "×?×?×¨×?×? ×?×©×ª×?×© ×©×? ×?×¤×?×¤×? Tor">
-<!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 "× ×?×? ×?×ª ×©×?×¨×?×ª×?×? Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "×ª×¨×?×? Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!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.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/he/brand.properties b/src/chrome/locale/he/brand.properties
index baf4637f..85cd3896 100644
--- a/src/chrome/locale/he/brand.properties
+++ b/src/chrome/locale/he/brand.properties
@@ -8,9 +8,9 @@ brandFullName=×?×¤×?×¤×? Tor
 vendorShortName=×?×?×?×? Tor
 
 homePageSingleStartMain=Firefox Start, ×?×£ ×?×?×ª ×?×?×?×¨ ×¢×? ×?×?×¤×?×© ×?×?×?× ×?
-homePageImport=×?×?×?×? ×?×ª ×?×£ ×?×?×?×ª ×©×?×? ×?-%S
+homePageImport=×?×?×?×? ×?×ª ×?×£ ×?×?×?×ª ×©×?×? ×?×? %S
 
 homePageMigrationPageTitle=×?×?×?×¨×ª ×?×£ ×?×?×ª
-homePageMigrationDescription=×?× ×? ×?×?×¨ ×?×ª ×?×£ ×?×?×?×ª ×©×?×¨×¦×?× ×? ×?×?×©×ª×?×© ×?×?:
+homePageMigrationDescription=×?× ×? ×?×?×¨ ×?×ª ×?×£ ×?×?×?×ª ×©×?×ª×? ×¨×?×¦×? ×?×?×©×ª×?×© ×?×?:
 
 syncBrandShortName=×¡× ×?×¨×?
diff --git a/src/chrome/locale/he/browserOnboarding.properties b/src/chrome/locale/he/browserOnboarding.properties
new file mode 100644
index 00000000..a4f1edf0
--- /dev/null
+++ b/src/chrome/locale/he/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=×¤×¨×?×?×?×ª
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=×?×?×?×?×?
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=×©×?×¨×?×ª×? ×?×¦×?
+onboarding.tour-tor-onion-services.title=×©×?×¨×?×ª×? ×?×¦×?
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/he/torbutton.properties b/src/chrome/locale/he/torbutton.properties
index c153c619..cdcd18c7 100644
--- a/src/chrome/locale/he/torbutton.properties
+++ b/src/chrome/locale/he/torbutton.properties
@@ -21,20 +21,20 @@ torbutton.popup.external.suggest = ×?×?×ª×¨ ×?×?×?×?×?×?, ×¢×?×?×? ×?×¤×ª×?×? ×§
 torbutton.popup.launch = ×?×?×¨×? ×§×?×?×¥
 torbutton.popup.cancel = ×?×?×?
 torbutton.popup.dontask = ×?×?×¨×? ×§×?×¦×?×? ×?×?×?×¤×? ×?×?×?×?×?×?×? ×?×¢×ª×? ×?×?×?×?×?
-torbutton.popup.prompted_language = ×?×?×? ×?×ª×ª ×?×? ×?×?×ª×¨ ×¤×¨×?×?×?×ª, Torbutton ×?×?×?×? ×?×?×§×© ×?×ª ×?×?×¨×¡×? ×?×?× ×?×?×?×ª ×©×? ×?×ª×¨×? ×?×?× ×?×¨× ×?. ×?×? ×¢×©×?×? ×?×?×¨×?×? ×?×?×ª×¨×?×? ×©×?×ª×? ×?×¢×?×?×£ ×?×§×¨×?×? ×?×©×¤×ª ×?×?×? ×©×?×? ×?×?×?×?×ª ×?×?×¦×?×?×? ×?×?× ×?×?×?×ª ×?×?×§×?×?.\n\n×?×?×? ×?×¨×¦×?× ×? ×?×?×§×© ×?×ª×¨×?×? ×?×©×¤×? ×?×?× ×?×?×?×ª ×¢×?×?×¨ ×¤×¨×?×?×?×ª ×?×?×?×? ×?×?×ª×¨?
+torbutton.popup.prompted_language = ×?×?×? ×?×ª×ª ×?×? ×?×?×ª×¨ ×¤×¨×?×?×?×ª, Torbutton ×?×?×?×? ×?×?×§×© ×?×ª ×?×?×¨×¡×? ×?×?× ×?×?×?×ª ×©×? ×?×ª×¨×? ×?×?× ×?×¨× ×?. ×?×? ×¢×©×?×? ×?×?×¨×?×? ×?×?×ª×¨×?×? ×©×?×ª×? ×?×¢×?×?×£ ×?×§×¨×?×? ×?×©×¤×ª ×?×?×? ×©×?×? ×?×?×?×?×ª ×?×?×¦×?×?×? ×?×?× ×?×?×?×ª ×?×?×§×?×?.\n\n×?×?×? ×?×ª×? ×¨×?×¦×? ×?×?×§×© ×?×ª×¨×?×? ×?×©×¤×? ×?×?× ×?×?×?×ª ×¢×?×?×¨ ×¤×¨×?×?×?×ª ×?×?×?×? ×?×?×ª×¨?
 torbutton.popup.no_newnym = Torbutton ×?×?× ×? ×?×?×?×? ×?×ª×ª ×?×? ×?×?×?×?×? ×?×?×?×ª ×?×?×©×?. ×?×?×? ×?×? ×?×?×©×? ×?×? ×¤×ª×?×ª ×?×?×§×¨×? ×©×? Tor.\n\n×?×?×? ×?×ª×? ×?×¨×?×¥ ×?×ª ×?×?×?×?×ª ×?×¤×?×¤×? Tor?
 torbutton.title.prompt_torbrowser = ×?×?×?×¢ ×?×©×?×? ×©×? Torbutton
-torbutton.popup.prompt_torbrowser = Torbutton ×¢×?×?×? ×?×?×?×? ×?×?×¨×ª: ×?×?× ×? ×?×?×?×? ×?×?×?×?×ª ×?×?×ª×? ×?×?×ª×¨.\n\n×¢×©×?× ×? ×©×?× ×?×? ×?×? ×?×? ×?×?×? ×?×? ×?×?×?×? ×?×?×©×ª×?×© ×?-Torbutton ×?×?×¤×?×¤×? ×?× ×?×¦×? ×?×©×?×?×?×© ×?×? ×¢×?×?×¨ ×?×?×?×©×? ×©×?×?× ×? Tor. ×?×?×? ×?×?×ª×¨ ×?×?×? ×ª×§×?×?×? ×©×?×? ×?×?×?×?× ×? ×?×ª×§×? ×?×?×? ×?×¨×? ×?×?×¨×ª.\n\n×?×? ×?×¨×¦×?× ×? ×?×?×?×©×?×? ×?×?×©×ª×?×© ×?-Firefox ×?×¨×?×?×?, ×¢×?×?×? ×?×?×¡×?×¨ ×?×ª Torbutton ×?×?×?×?×¨×?×? ×?×ª ×?×?×?×?×ª ×?×¤×?×¤×? Tor. ×?×?×¤×?×?× ×? ×?×¤×¨×?×?×?×ª ×©×? ×?×¤×?×¤×? Tor ×?×? × ×¢×?×?×? ×?×?×ª×¨ ×?×?×©×¨ ×?×?×? ×©×? Firefox ×¨×?×?×?, ×?×¤×?×?×? ×?×?×©×¨ Firefox × ×?×¦×? ×?×©×?×?×?×© ×¢×? Torbutton.\n\n×?×?×? ×?×?×¡×?×¨ ×?×ª Torbutton, ×?×? ×?×? ×?×?×?×?->×ª×?×¡×¤×?×ª->×?×¨×?×?×?×ª ×?×?×? ×?×?×¥ ×¢×? ×?×?×¤×ª×?×¨ ×?×¡×¨ ×?×?×? Torbutton.
+torbutton.popup.prompt_torbrowser = Torbutton ×¢×?×?×? ×?×?×?×? ×?×?×¨×ª: ×?×?× ×? ×?×?×?×? ×?×?×?×?×ª ×?×?×ª×? ×?×?×ª×¨.\n\n×¢×©×?× ×? ×©×?× ×?×? ×?×? ×?×? ×?×?×? ×?×? ×?×?×?×? ×?×?×©×ª×?×© ×?-Torbutton ×?×?×¤×?×¤×? ×?× ×?×¦×? ×?×©×?×?×?×© ×?×? ×¢×?×?×¨ ×?×?×?×©×? ×©×?×?× ×? Tor. ×?×?×? ×?×?×ª×¨ ×?×?×? ×ª×§×?×?×? ×©×?×? ×?×?×?×?× ×? ×?×ª×§×? ×?×?×? ×?×¨×? ×?×?×¨×ª.\n\n×?×? ×?×ª×? ×¨×?×¦×? ×?×?×?×©×?×? ×?×?×©×ª×?×© ×?-Firefox ×?×¨×?×?×?, ×¢×?×?×? ×?×?×¡×?×¨ ×?×ª Torbutton ×?×?×?×?×¨×?×? ×?×ª ×?×?×?×?×ª ×?×¤×?×¤×? Tor. ×?×?×¤×?×?× ×? ×?×¤×¨×?×?×?×ª ×©×? ×?×¤×?×¤×? Tor ×?×? × ×¢×?×?×? ×?×?×ª×¨ ×?×?×©×¨ ×?×?×? ×©×? Firefox ×¨×?×?×?, ×?×¤×?×?×? ×?×?×©×¨ Firefox × ×?×¦×? ×?×©×?×?×?×© ×¢×? Torbutton.\n\n×?×?×? ×?×?×¡×?×¨ ×?×ª Torbutton, ×?×? ×?×? ×?×?×?×?->×ª×?×¡×¤×?×ª->×?×¨×?×?×?×ª ×?×?×? ×?×?×¥ ×¢×? ×?×?×¤×ª×?×¨ ×?×¡×¨ ×?×?×? Torbutton.
 torbutton.popup.short_torbrowser = ×?×?×?×¢ ×?×©×?×? ×¢×? Torbutton!\nTorbutton ×ª×?×?×? ×?×?×?×¤×©×¨ ×¢×?×©×?×?.\n×?×?×¥ ×¢×? ×?-Torbutton ×?×¢×?×? ×?×?×?×¢.
 
-torbutton.popup.confirm_plugins = ×?×ª×§×¢×?×? ×?×?×?×? Flash ×?×?×?×?×?×? ×?×¤×?×?×¢ ×?×¤×¨×?×?×?×ª×? ×?×?×?×?×?×?× ×?×?×ª×?.\n\n×?×? ×?×?×?×?×?×? ×?×? ×?×¢×§×?×£ ×?×ª Tor ×?×?×? ×?×?×©×?×£ ×?×ª ×?×?×§×?×?×? ×?× ×?×?×?×? ×?×?×ª ×?×ª×?×?×ª ×?-IP ×©×?×?.\n\n×?×?×? ×?×ª×? ×?×?×?×? ×©×?×¨×¦×?× ×? ×?×?×¤×©×¨ ×?×ª×§×¢×?×??\n\n
+torbutton.popup.confirm_plugins = ×?×ª×§×¢×?×? ×?×?×?×? Flash ×?×?×?×?×?×? ×?×¤×?×?×¢ ×?×¤×¨×?×?×?×ª×? ×?×?×?×?×?×?× ×?×?×ª×?.\n\n×?×? ×?×?×?×?×?×? ×?×? ×?×¢×§×?×£ ×?×ª Tor ×?×?×? ×?×?×©×?×£ ×?×ª ×?×?×§×?×?×? ×?× ×?×?×?×? ×?×?×ª ×?×ª×?×?×ª ×?-IP ×©×?×?.\n\n×?×?×? ×?×ª×? ×?×?×?×? ×©×?×ª×? ×¨×?×¦×? ×?×?×¤×©×¨ ×?×ª×§×¢×?×??\n\n
 torbutton.popup.never_ask_again = ×?×£ ×¤×¢×? ×?×? ×ª×©×?×? ×?×?×ª×? ×©×?×?
 torbutton.popup.confirm_newnym = ×?×¤×?×¤×? Tor ×?×¡×?×?×¨ ×?×ª ×?×? ×?×?×?×?× ×?×ª ×?×?×?×©×?× ×?×?×ª. ×?×? ×©×?×?×? ×?×?×ª×¨×?×? ×?×?×?×?×?. \n\n×?×?×¤×¢×?×? ×?×?×?×© ×?×ª ×?×¤×?×¤×? Tor ×¢×?×©×?×? ×?×?×? ×?×?×¤×¡ ×?×ª ×?×?×?×ª×??\n\n
 
 torbutton.slider_notification = ×?×ª×¤×¨×?×? ×©×? ×?×?×¦×? ×?×?×¨×?×§ ×?×© ×?×¢×ª ×?×?×?×?×? ×?×?×?×?×? ×?×?×?×¤×©×¨ ×?×? ×?×?×ª×?×?×? ×?×ª ×¨×?×ª ×?×?×?×?×?×? ×©×?×?. × ×¡×? ×?×?×ª×?!
 torbutton.slider_notification_button = ×¤×ª×? ×?×?×?×¨×?×ª ×?×?×?×?×?
 
-torbutton.maximize_warning = ×?×¤×¢×?×ª ×?×¡×? ×?×?×? ×?×?×¤×?×¤×? Tor ×¢×?×?×?×? ×?×?×ª×?×¨ ×?×?×ª×¨×?×? ×?×§×?×?×¢ ×?×ª ×?×?×?×? ×?×¦×? ×©×?×?, ×?×? ×©×¢×?×?×? ×?×©×?×© ×?×?×ª×¨ ×?×?×ª×?. ×?× ×? ×?×?×?×?×¦×?×? ×©×ª×?×ª×?×¨ ×?×ª ×?×?×?× ×?×ª ×?×¤×?×¤×? Tor ×?×?×?×?×? ×?×¨×?×¨×ª ×?×?×?×?×? ×?×?×§×?×¨×? ×©×?×?×?.
+torbutton.maximize_warning = ×?×¤×¢×?×ª ×?×¡×? ×?×?×? ×?×?×¤×?×¤×? Tor ×¢×?×?×?×? ×?×?×ª×?×¨ ×?×?×ª×¨×?×? ×?×§×?×?×¢ ×?×ª ×?×?×?×? ×?×¦×? ×©×?×?, ×?×? ×©×¢×?×?×? ×?×©×?×© ×?×?×? ×?×?×ª×¨ ×?×?×ª×?. ×?× ×? ×?×?×?×?×¦×?×? ×©×ª×©×?×?×¨ ×?×ª ×?×?×?× ×?×ª ×?×¤×?×¤×? Tor ×?×?×?×?×? ×?×¨×?×¨×ª ×?×?×?×?×? ×?×?×§×?×¨×? ×©×?×?×?.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=×?×ª×¨ ×?×? (%S) × ×?×¡×? ×?×?×?×¥ × ×ª×?× ×? ×ª×?×?× ×?×ª ×§× ×?×¡ HTML5, ×?×©×¨ ×¢×©×?×?×?×? ×?×©×?×© ×?×?×? ×?×?×?×?×ª ×?×?×?×¤×? ×?×?×?×?×?×? ×?×ª ×?×?×©×?×?.\n\n×?×?×? ×¢×? ×?×¤×?×¤×? Tor ×?×?×ª×?×¨ ×?×?×?×¥ × ×ª×?× ×? ×ª×?×?× ×?×ª ×§× ×?×¡ HTML5?
diff --git a/src/chrome/locale/id/aboutDialog.dtd b/src/chrome/locale/id/aboutDialog.dtd
new file mode 100644
index 00000000..4d73913c
--- /dev/null
+++ b/src/chrome/locale/id/aboutDialog.dtd
@@ -0,0 +1,19 @@
+<!ENTITY project.start           "&brandShortName; dikembangkan oleh">
+<!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
+<!ENTITY project.tpoLink         "&vendorShortName;">
+<!ENTITY project.end             ", sebuah perusahaan nirlaba yang bekerja untuk melindungi privasi dan kebebasan penjelajahan Anda.">
+
+<!ENTITY help.start              "Ingin membantu?">
+<!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://www.torproject.org/donate/donate.html.en -->
+<!ENTITY help.donateLink         "Donasi">
+<!ENTITY help.or                 "atau">
+<!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en -->
+<!ENTITY help.getInvolvedLink    "ikut terlibat">
+<!ENTITY help.end                "!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en -->
+<!ENTITY bottomLinks.questions   "Pertanyaan?">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/getinvolved/relays -->
+<!ENTITY bottomLinks.grow        "Bantu Kembangakan Jaringan Tor!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
+<!ENTITY bottomLinks.license  "Informasi Lisensi">
+<!ENTITY tor.TrademarkStatement   "'Tor' dan 'Logo Onion' adalah merek dagang terdaftar Tor Project, Inc.">
diff --git a/src/chrome/locale/id/aboutTBUpdate.dtd b/src/chrome/locale/id/aboutTBUpdate.dtd
new file mode 100644
index 00000000..ba3aa4df
--- /dev/null
+++ b/src/chrome/locale/id/aboutTBUpdate.dtd
@@ -0,0 +1,6 @@
+<!ENTITY aboutTBUpdate.title "Pemutakhiran peramban Tor">
+<!ENTITY aboutTBUpdate.updated "Peramban Tor telah diperbarui.">
+<!ENTITY aboutTBUpdate.linkPrefix "Untuk informasi paling terbaru mengenai rilisan ini,">
+<!ENTITY aboutTBUpdate.linkLabel  "kunjungi situs web kami">
+<!ENTITY aboutTBUpdate.linkSuffix ".">
+<!ENTITY aboutTBUpdate.changeLogHeading "Catatan Perubahan:">
diff --git a/src/chrome/locale/id/aboutTor.dtd b/src/chrome/locale/id/aboutTor.dtd
index 9f14022b..aa7e72fa 100644
--- a/src/chrome/locale/id/aboutTor.dtd
+++ b/src/chrome/locale/id/aboutTor.dtd
@@ -1,47 +1,25 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Tentang 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.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
+<!ENTITY aboutTor.failure.label "Ada Masalah!">
+<!ENTITY aboutTor.failure2.label "Tor tidak dapat digunakan di peramban ini.">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.success.label "Congratulations!">
-<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
-<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
-<!ENTITY aboutTor.failure.label "Something Went Wrong!">
-<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
-<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Pertanyaan?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
+<!ENTITY aboutTor.torbrowser_user_manual.accesskey "m">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search";>
-<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
-
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
-<!ENTITY aboutTor.torInfo3.label "Exit Node:">
-<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
-<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
-<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
-<!ENTITY aboutTor.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.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.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/terlibat/relawan.html.id";>
diff --git a/src/chrome/locale/id/aboutTor.properties b/src/chrome/locale/id/aboutTor.properties
index 02088f01..d3ffe671 100644
--- a/src/chrome/locale/id/aboutTor.properties
+++ b/src/chrome/locale/id/aboutTor.properties
@@ -2,14 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+aboutTor.searchDDG.privacy=Cari <a href="%1$S">secara aman</a> dengan <a href="%2$S">DuckDuckGo</a>.
 # The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privasi.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.donationBanner.donate=Donasi Sekarang!
+
+aboutTor.donationBanner.slogan=Tor: Menggerakan Perlawanan Digital
+aboutTor.donationBanner.mozilla=Beri hari ini dan Mozilla akan mencocokkan hadiah anda
+
+aboutTor.donationBanner.tagline1=Melindungi jurnalis, pelapor pelanggaran dan aktivis sejak 2006
+aboutTor.donationBanner.tagline2=Kebebasan Jaringan di seluruh dunia
+aboutTor.donationBanner.tagline3=Bebas berinternet
+aboutTor.donationBanner.tagline4=Merawat Kebebasan Berekspresi di Seluruh Dunia
+aboutTor.donationBanner.tagline5=Melindungi Privasi Jutaan Orang Setiap Hari
diff --git a/src/chrome/locale/id/brand.dtd b/src/chrome/locale/id/brand.dtd
index 59f665e8..213c71d5 100644
--- a/src/chrome/locale/id/brand.dtd
+++ b/src/chrome/locale/id/brand.dtd
@@ -2,7 +2,14 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY  brandShortName        "Tor Browser">
-<!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  brandShorterName      "Peramban Tor">
+<!ENTITY  brandShortName        "Peramban Tor">
+<!ENTITY  brandFullName         "Peramban Tor">
+<!ENTITY  vendorShortName       "Proyek Tor">
+<!ENTITY  trademarkInfo.part1   "Firefox dan logo Firefox merupakan merek dagang dari Mozilla Foundation.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Klik untuk memuat pengaya sistem yang terpasang">
+<!ENTITY plugins.installed.enable "Fungsikan pengaya">
+<!ENTITY plugins.installed.disable "Nonfungsikan pengaya">
+<!ENTITY plugins.installed.disable.tip "Klik untuk mencegah pemuatan pengaya sistem">
diff --git a/src/chrome/locale/id/brand.properties b/src/chrome/locale/id/brand.properties
index f63def38..8b36aae3 100644
--- a/src/chrome/locale/id/brand.properties
+++ b/src/chrome/locale/id/brand.properties
@@ -2,14 +2,15 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShortName=Tor Browser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+brandShorterName=Peramban Tor
+brandShortName=Peramban Tor
+brandFullName=Peramban Tor
+vendorShortName=Proyek Tor
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Firefox Start, halaman muka yang cepat dengan pencarian bawaan
+homePageImport=Impor halaman beranda Anda dari %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=Pemilihan Halaman Muka
+homePageMigrationDescription=Silahkan pilih halaman beranda yang ingin Anda gunakan:
 
-syncBrandShortName=Sync
+syncBrandShortName=Sinkronkan
diff --git a/src/chrome/locale/id/browserOnboarding.properties b/src/chrome/locale/id/browserOnboarding.properties
new file mode 100644
index 00000000..b914d96c
--- /dev/null
+++ b/src/chrome/locale/id/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Selamat datang
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Privasi
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=Keamanan
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Layanan Onion
+onboarding.tour-tor-onion-services.title=Layanan Onion
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd
index 73c4ed73..b3a1c136 100644
--- a/src/chrome/locale/id/torbutton.dtd
+++ b/src/chrome/locale/id/torbutton.dtd
@@ -1,12 +1,19 @@
 <!ENTITY torbutton.context_menu.new_identity "Identitas Baru">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "A">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.new_circuit "Sirkuit Tor Baru untuk Situs ini">
+<!ENTITY torbutton.context_menu.new_circuit_key "C">
+<!ENTITY torbutton.context_menu.preferences "Pengaturan Keamanan...">
+<!ENTITY torbutton.context_menu.preferences.key "S">
+<!ENTITY torbutton.context_menu.networksettings "Pengaturan Jaringan Torâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
+<!ENTITY torbutton.context_menu.downloadUpdate "Cek Versi Peramban Tor Terkini">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
+<!ENTITY torbutton.context_menu.cookieProtections "Perlindungan Cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.button.tooltip "Klik untuk mengaktifkan Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Kembalikan ke asal">
+<!ENTITY torbutton.button.tooltip "Klik untuk mengaktifkan TombolTor">
+<!ENTITY torbutton.prefs.security_settings "Pengaturan Keamanan Tor Browser">
+<!ENTITY torbutton.prefs.restore_defaults "Kembalikan Kestandar">
+<!ENTITY torbutton.prefs.custom_warning "Preferensi browser khusus anda telah membuat pengaturan keamanan yang tidak biasa. Untuk alasan keamanan dan privasi, kami menyarankan anda untuk memilih satu dari tingkat keamanan bawaan.">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -19,4 +26,26 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Jaga kotak ini tetap tercentang untuk mencegah berbagai fitur browser dari penyalahgunaan untuk melacak anda saat sedang menelusuri web. Fitur modifikasi termasuk URL blob, saluran siaran, cache browser, cookies, favicon, kepala HTTP Auth, link preconnect, localStorage, URL mediaSource, permintaan OCSP, SharedWorkets, dan sesi tiket TLS.">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Ubah rincian yang membedakan Anda dari pengguna peramban Tor lain.">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Biarkan kotak ini tetap dicentang untuk menyembunyikan hal-hal yang unik tentang Anda dari situs web, termasuk kinerja komputer Anda, susunan keyboard, bahasa, lokasi pengaya terpasang, daftar dari pengaya terpasang, status jaringan, orientasi layar, ukuran layar, tingkat pembesaran situs-spesifik, tipe berkas yang didukung, warna sistem, dan kemampuan WebGL.">
+<!ENTITY torbutton.prefs.sec_caption "Tingkat Keamanan">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "Penggeser keamanan memungkinkan anda untuk menonaktifkan fitur browser yang dapat membuat browser anda menjadi lebih rentant dari upaya peretasan.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standar">
+<!ENTITY torbutton.prefs.sec_standard_description "Semua fitur dari Tor Browser dan situs web diaktifkan.">
+<!ENTITY torbutton.prefs.sec_safer_label "Lebih aman">
+<!ENTITY torbutton.prefs.sec_safer_description "Menonaktifkan fitur-fitur situs web yang sering berbahaya, ini akan membuat beberapa situs kehilangan fungsionalitas.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "Di pengaturan yang lebih aman:">
+<!ENTITY torbutton.prefs.sec_safest_label "Paling aman">
+<!ENTITY torbutton.prefs.sec_safest_description "Hanya menjalankan fitur-fitur situs yang diperlukan untuk menjalankan situs web statis dan servis dasar. Perubahan ini mempengaruhi gambar, media, dan skrip.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "Di pengaturan yang paling aman:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Pelajari lebih lanjut">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript dinonaktifkan di semua situs non-HTTPS.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript dinonaktifkan secara default di semua situs.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Beberapa font dan simbol matematika dinonaktifkan.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Beberapa font, icon, simbol matematika, dan gambar dinonaktifkan.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio dan video (media HTML5 media) dijalankan saat diklik.">
+<!ENTITY torbutton.circuit_display.title "Sirkuit Tor">
+<!ENTITY torbutton.circuit_display.new_circuit "Sirkuit Baru untuk Situs Ini">
diff --git a/src/chrome/locale/id/torbutton.properties b/src/chrome/locale/id/torbutton.properties
index ed812e8a..01ec5cae 100644
--- a/src/chrome/locale/id/torbutton.properties
+++ b/src/chrome/locale/id/torbutton.properties
@@ -1,15 +1,26 @@
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = IP tidak diketahui
+torbutton.circuit_display.onion_site = Situs onion
+torbutton.circuit_display.this_browser = Peramban ini
+torbutton.circuit_display.relay = Relay
+torbutton.circuit_display.tor_bridge = Jembatan
+torbutton.circuit_display.unknown_country = Negara tidak diketahui
+torbutton.circuit_display.guard = Penjaga
+torbutton.circuit_display.guard_note = Titik [Penjaga] Anda tidak dapat berubah
+torbutton.circuit_display.learn_more = Pelajari lebih lanjut
+torbutton.content_sizer.margin_tooltip = Adds Browser Tor margin ini untuk membuat Lebar dan tinggi dari window anda kurang khas
 torbutton.panel.tooltip.disabled = Klik untuk mengaktifkan Tor
 torbutton.panel.tooltip.enabled = Klik untuk menonaktifkan Tor
 torbutton.panel.label.disabled = Tor dinonaktifkan
 torbutton.panel.label.enabled = Tor diaktifkan
 extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.external.title = Muat konten eksternal?
-torbutton.popup.external.app = Sebuah aplikasi eksternal butuh untuk ditangani:\n\n
-torbutton.popup.external.note = \n\nCATATAN: secara default, aplikasi eksternal tidaklah aman untuk Tor dan dapat membuka penyamaran Anda!\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-torbutton.popup.launch = Luncurkan aplikasi.
+torbutton.popup.external.title = Unduh sebuah tipe file eksternal?
+torbutton.popup.external.app = Browser Tor tidak dapat menampilkan file ini. Anda butuh aplikasi lain untuk membukanya\n
+torbutton.popup.external.note = Beberapa tipe file dapat menyebabkan aplikasi terkoneksi ke internet tanpa menggunakan Tor\n\n
+torbutton.popup.external.suggest = Agar aman, sebaiknya anda hanya membuka file selagi offline, atau gunakan Tor Live CD seperti Tails.\n
+torbutton.popup.launch = Unduh file
 torbutton.popup.cancel = Batal
-torbutton.popup.dontask = Selalu luncurkan aplikasi mulai dari sekarang
+torbutton.popup.dontask = Secara otomatis file-file akan di unduh mulai sekarang
 torbutton.popup.prompted_language = Untuk memberikan Anda kerahasiaan yang lebih, Torbutton akan meminta versi bahasa Inggris dari halaman web. Ini mungkin menyebabkan halaman web yang Anda ingin baca dalam bahasa asli Anda akan ditampilkan dalam bahasa Inggris. â?? â?? Apakah anda mau meminta halaman web bahasa Inggris untuk kerahasiaan yang lebih baik?
 torbutton.popup.no_newnym = Torbution tidak dapat memberikan Anda identitas baru secara aman. Torbutton tidak memiliki akses terhadap Tor Control Port. â??â?? Apakah Anda sedang menjalankan paket browser Tor?
 torbutton.title.prompt_torbrowser = Important Torbutton Information
@@ -17,11 +28,31 @@ torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't t
 torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
 torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.never_ask_again = Jangan pernah ditanyakan kembali
+torbutton.popup.confirm_newnym = Peramban Tor akan menutup semua jendela dan tab. Semua sesi website akan terhapus.\n\nJalankan ulang peramban Tor untuk 
+
+torbutton.slider_notification = Menu green onion sekarang memiliki slider keamanan yang memungkinkan anda mengatur level keamanan . silakan cek !
+torbutton.slider_notification_button = Buka pengaturan keamanan
+
+torbutton.maximize_warning = Maksimalkan Browser Tor dapat mengizinkan website untuk menentukan ukuran monitor anda, yang dapat digunakan untuk track/jalur anda. kami menyarankan bahwa nda meninggalkan windows browser Tor dalam ukuran asli default nya
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=Situs ini (%S) butuh untuk mengekstrak data gambar HTML5 , yang mungkin akan mengetahui identitas komputer anda.\n\nApakah anda mengizinkan peramban Tor untuk mengekstrak data gambar HTML5
+canvas.notNow=Tidak untuk Sekarang
+canvas.notNowAccessKey=N
+canvas.allow=Izinkan kedepannya
 canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Jangan pernah untuk situs ini (disarankan)
 canvas.neverAccessKey=e
+
+# Profile/startup error messages. Strings are kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+profileProblemTitle=%S Profile bermasalah
+profileReadOnly=Anda tidak dapat menjalankan %S dari Sistem File Read only. Silakan copy %S ke lokasi lain sebelum mencoba menggunakannya
+profileReadOnlyMac=Anda tidak bisa menjalankan %S dari File sistem  read-only .  Silakan  copy %S ke desktop anda atau folder aplikasi sebelum mencoba menggunakannya.
+profileAccessDenied=%S tidak memiliki izin untuk mengakses profile .Silakan atur perizinan sistem file anda dan coba lagi .
+profileMigrationFailed=Migrasi dari profil %S gagal.\nSetting baru akan digunakan.
+
+# .Onion Page Info prompt.  Strings are kept here for ease of translation.
+pageInfo_OnionEncryptionWithBitsAndProtocol=Koneksi terenkripsi (Layanan Onion, %1$S, %2$S bit kunci, %3$S)
+pageInfo_OnionEncryption=Koneksi terenkripsi (Layanan Onion)
diff --git a/src/chrome/locale/is/aboutDialog.dtd b/src/chrome/locale/is/aboutDialog.dtd
new file mode 100644
index 00000000..24b79d09
--- /dev/null
+++ b/src/chrome/locale/is/aboutDialog.dtd
@@ -0,0 +1,19 @@
+<!ENTITY project.start           "&brandShortName; er Ã¾rÃ³aÃ° af ">
+<!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
+<!ENTITY project.tpoLink         "&vendorShortName;">
+<!ENTITY project.end             ", frjÃ¡lsum fÃ©lagasamtÃ¶kum sem vinna aÃ° Ã¾vÃ aÃ° verja rÃ©tt Ã¾inn til einkalÃfs og frelsi Ã¾itt Ã¡ netinu.">
+
+<!ENTITY help.start              "Viltu hjÃ¡lpa?">
+<!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://www.torproject.org/donate/donate.html.en -->
+<!ENTITY help.donateLink         "Styrkja">
+<!ENTITY help.or                 "eÃ°a">
+<!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en -->
+<!ENTITY help.getInvolvedLink    "taka Ã¾Ã¡tt">
+<!ENTITY help.end                "!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en -->
+<!ENTITY bottomLinks.questions   "Spurningar?">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/getinvolved/relays -->
+<!ENTITY bottomLinks.grow        "HjÃ¡lpaÃ°u Tor-netinu aÃ° vaxa!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
+<!ENTITY bottomLinks.license  "UpplÃ½singar um notkunarleyfi">
+<!ENTITY tor.TrademarkStatement   "'Tor' og 'LaukmerkiÃ°' (Onion Logo) eru skrÃ¡Ã° vÃ¶rumerki Tor Project, Inc.">
diff --git a/src/chrome/locale/is/aboutTBUpdate.dtd b/src/chrome/locale/is/aboutTBUpdate.dtd
new file mode 100644
index 00000000..3a2cdec8
--- /dev/null
+++ b/src/chrome/locale/is/aboutTBUpdate.dtd
@@ -0,0 +1,6 @@
+<!ENTITY aboutTBUpdate.title "UppfÃ¦rsla Tor-vafra">
+<!ENTITY aboutTBUpdate.updated "Tor-vafrinn var uppfÃ¦rÃ°ur.">
+<!ENTITY aboutTBUpdate.linkPrefix "Til aÃ° sjÃ¡ allra nÃ½justu upplÃ½singar um Ã¾essa ÃºtgÃ¡fu,">
+<!ENTITY aboutTBUpdate.linkLabel  "heimsÃ¦ktu vefsvÃ¦Ã°iÃ° okkar">
+<!ENTITY aboutTBUpdate.linkSuffix ".">
+<!ENTITY aboutTBUpdate.changeLogHeading "BreytingaannÃ¡ll:">
diff --git a/src/chrome/locale/is/aboutTor.dtd b/src/chrome/locale/is/aboutTor.dtd
index 9f14022b..63152e0a 100644
--- a/src/chrome/locale/is/aboutTor.dtd
+++ b/src/chrome/locale/is/aboutTor.dtd
@@ -1,47 +1,25 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Um 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.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
+<!ENTITY aboutTor.failure.label "EitthvaÃ° fÃ³r ÃºrskeiÃ°is!">
+<!ENTITY aboutTor.failure2.label "Tor virkar ekki Ã Ã¾essum vafra.">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.success.label "Congratulations!">
-<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
-<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
-<!ENTITY aboutTor.failure.label "Something Went Wrong!">
-<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
-<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Spurningar?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
+<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search";>
-<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
-
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
-<!ENTITY aboutTor.torInfo3.label "Exit Node:">
-<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
-<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
-<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
-<!ENTITY aboutTor.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.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.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/is/aboutTor.properties b/src/chrome/locale/is/aboutTor.properties
index 02088f01..fde655f3 100644
--- a/src/chrome/locale/is/aboutTor.properties
+++ b/src/chrome/locale/is/aboutTor.properties
@@ -2,14 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+aboutTor.searchDDG.privacy=Leita Ã¡ <a href="%1$S">Ã¶ruggan hÃ¡tt</a> meÃ° <a href="%2$S">DuckDuckGo</a>.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.donationBanner.donate=Styrkja nÃºna!
+
+aboutTor.donationBanner.slogan=Tor: Keyrir Ã¡fram stafrÃ¦nu andspyrnuhreyfinguna
+aboutTor.donationBanner.mozilla=GefÃ°u Ã dag og Mozilla kemur meÃ° mÃ³tframlag!
+
+aboutTor.donationBanner.tagline1=Verndar blaÃ°amenn, aÃ°gerÃ°asinna og uppljÃ³strara sÃÃ°an 2006
+aboutTor.donationBanner.tagline2=Frelsi Ã¡ netinu Ãºt um allan heim
+aboutTor.donationBanner.tagline3=Frelsi Ã¡ netinu
+aboutTor.donationBanner.tagline4=FÃ³strar frjÃ¡ls skoÃ°anaskipti Ãºt um allan heim
+aboutTor.donationBanner.tagline5=Verndar einkalÃf milljÃ³na manna Ã¡ hverjum degi
diff --git a/src/chrome/locale/is/brand.dtd b/src/chrome/locale/is/brand.dtd
index 59f665e8..5b4ded3a 100644
--- a/src/chrome/locale/is/brand.dtd
+++ b/src/chrome/locale/is/brand.dtd
@@ -2,7 +2,14 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY  brandShortName        "Tor Browser">
-<!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  brandShorterName      "Tor-vafrinn">
+<!ENTITY  brandShortName        "Tor-vafrinn">
+<!ENTITY  brandFullName         "Tor-vafrinn">
+<!ENTITY  vendorShortName       "Tor-verkefniÃ°">
+<!ENTITY  trademarkInfo.part1   "Firefox og Firefox merkin eru vÃ¶rumerki Mozilla Foundation.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Smelltu til aÃ° hlaÃ°a inn uppsettum kerfisviÃ°bÃ³tum">
+<!ENTITY plugins.installed.enable "Virkja viÃ°bÃ¦tur">
+<!ENTITY plugins.installed.disable "Gera viÃ°bÃ¦tur Ã³virkar">
+<!ENTITY plugins.installed.disable.tip "Smelltu til aÃ° koma Ã veg fyrir aÃ° kerfisviÃ°bÃ³tum sÃ© hlaÃ°iÃ° inn">
diff --git a/src/chrome/locale/is/brand.properties b/src/chrome/locale/is/brand.properties
index f63def38..d00a3f5f 100644
--- a/src/chrome/locale/is/brand.properties
+++ b/src/chrome/locale/is/brand.properties
@@ -2,14 +2,15 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShortName=Tor Browser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+brandShorterName=Tor-vafrinn
+brandShortName=Tor-vafrinn
+brandFullName=Tor-vafrinn
+vendorShortName=Tor-verkefniÃ°
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=UpphafssÃÃ°a Firefox, hraÃ°virk og meÃ° innbyggÃ°ri leit
+homePageImport=Flytja inn heimasÃÃ°una Ã¾Ãna frÃ¡ %s
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=Val heimasÃÃ°u
+homePageMigrationDescription=Veldu heimasÃÃ°una sem Ã¾Ãº vilt nota:
 
-syncBrandShortName=Sync
+syncBrandShortName=SamrÃ¦ma
diff --git a/src/chrome/locale/is/browserOnboarding.properties b/src/chrome/locale/is/browserOnboarding.properties
new file mode 100644
index 00000000..3da820ef
--- /dev/null
+++ b/src/chrome/locale/is/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=FriÃ°helgi
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=Security
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion-Ã¾jÃ³nustur
+onboarding.tour-tor-onion-services.title=Onion-Ã¾jÃ³nustur
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd
index 629ea245..de0c5ecc 100644
--- a/src/chrome/locale/is/torbutton.dtd
+++ b/src/chrome/locale/is/torbutton.dtd
@@ -1,22 +1,51 @@
 <!ENTITY torbutton.context_menu.new_identity "NÃ½tt auÃ°kenni">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.new_circuit "NÃ½ Tor-rÃ¡s fyrir Ã¾etta vefsvÃ¦Ã°i">
+<!ENTITY torbutton.context_menu.new_circuit_key "C">
+<!ENTITY torbutton.context_menu.preferences "Ã?ryggisstillingarâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
+<!ENTITY torbutton.context_menu.networksettings "Netkerfisstillingar Torâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
+<!ENTITY torbutton.context_menu.downloadUpdate "AthugaÃ°u meÃ° uppfÃ¦rslur Tor-vafra...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections "Varnir gegn vefkÃ¶kum...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
-<!ENTITY torbutton.cookiedialog.lockCol "Protected">
-<!ENTITY torbutton.cookiedialog.domainCol "Host">
-<!ENTITY torbutton.cookiedialog.nameCol "Name">
-<!ENTITY torbutton.cookiedialog.pathCol "Path">
-<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
-<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
-<!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.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.button.tooltip "Smelltu til aÃ° kveikja Ã¡ Tor-hnapp">
+<!ENTITY torbutton.prefs.security_settings "Ã?ryggisstillingar Tor-vafrans">
+<!ENTITY torbutton.prefs.restore_defaults "Frumstilla Ã¡ sjÃ¡lfgefiÃ°">
+<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels.">
+<!ENTITY torbutton.cookiedialog.title "SÃ½sla meÃ° varnir gegn vefkÃ¶kum">
+<!ENTITY torbutton.cookiedialog.lockCol "VariÃ°">
+<!ENTITY torbutton.cookiedialog.domainCol "HÃ½silvÃ©l">
+<!ENTITY torbutton.cookiedialog.nameCol "Heiti">
+<!ENTITY torbutton.cookiedialog.pathCol "SlÃ³Ã°">
+<!ENTITY torbutton.cookiedialog.protectCookie "Vernda vefkÃ¶ku">
+<!ENTITY torbutton.cookiedialog.removeCookie "FjarlÃ¦gja vefkÃ¶ku">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Afvernda vefkÃ¶ku">
+<!ENTITY torbutton.cookiedialog.removeAllBut "FjarlÃ¦gja allar aÃ°rar en verndaÃ°ar">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Vernda nÃ½jar vefkÃ¶kur">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ekki vernda nÃ½jar vefkÃ¶kur">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Takmarka vefkÃ¶kur frÃ¡ Ã¾riÃ°ja aÃ°ila og Ã¶nnur ferligÃ¶gn">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Breyta atriÃ°um sem gera Ã¾ig Ã³lÃkan Ã¶Ã°rum notendum Tor-vafrans">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "HafÃ°u hakaÃ° Ã Ã¾ennan reit til aÃ° fela fyrir vefsvÃ¦Ã°um atriÃ°i sem gÃ¦tu veriÃ° einstÃ¶k hjÃ¡ Ã¾Ã©r, Ã¾ar meÃ° talin atriÃ°i eins og upplÃ½singar um afkÃ¶st tÃ¶lvunnar, lyklaborÃ°suppsetningu, staÃ°fÃ¦rslu, staÃ°setningu uppsettra viÃ°bÃ³ta, lista yfir uppsettar viÃ°bÃ¦tur, stÃ¶Ã°u netkerfis, stÃ¦rÃ° og stefnu skjÃ¡s, sÃ©rtÃ¦kan aÃ°drÃ¡tt fyrir vefsvÃ¦Ã°i, studdar skrÃ¡ategundir, kerfisliti og getu varÃ°andi WebGL.">
+<!ENTITY torbutton.prefs.sec_caption "Ã?ryggisstig">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
+<!ENTITY torbutton.prefs.sec_standard_label "StaÃ°laÃ°">
+<!ENTITY torbutton.prefs.sec_standard_description "Allir eiginleikar Tor-vafrans og vefsvÃ¦Ã°isins eru virkjaÃ°ir.">
+<!ENTITY torbutton.prefs.sec_safer_label "Ã?ruggara">
+<!ENTITY torbutton.prefs.sec_safer_description "Gerir Ã³virka Ã½msa eiginleika vefsvÃ¦Ã°a sem oft eru hÃ¦ttulegir, en veldur Ã¾vÃ aÃ° sum vefsvÃ¦Ã°i hÃ¦tta aÃ° virka eins og Ã¾au eiga aÃ° gera.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "MeÃ° Ã¶ruggari stillingum:">
+<!ENTITY torbutton.prefs.sec_safest_label "Ã?ruggast">
+<!ENTITY torbutton.prefs.sec_safest_description "Leyfir aÃ°eins Ã¾Ã¡ eiginleika vefsvÃ¦Ã°a sem krafist er fyrir beinan lestur (static sites) og grunnÃ¾jÃ³nustur. Ã?essar breytingar hafa Ã¡hrif Ã¡ myndir, margmiÃ°lunargÃ¶gn og skriftur.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "MeÃ° Ã¶ruggustu stillingum:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "LÃ¦ra meira">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript er Ã³virkt Ã¡ Ã¶llum ekki-HTTPS vefjum.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript er sjÃ¡lfgefiÃ° Ã³virkt Ã¡ Ã¶llum vefsvÃ¦Ã°um.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Sumt letur og stÃ¦rÃ°frÃ¦Ã°itÃ¡kn eru Ã³virk.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Sumt letur, tÃ¡knmyndir, myndir og stÃ¦rÃ°frÃ¦Ã°itÃ¡kn eru Ã³virk.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "HljÃ³Ã° og myndskeiÃ° (HTML5-gagnamiÃ°lar) Ã¾arf aÃ° smella Ã¡ til aÃ° spila.">
+<!ENTITY torbutton.circuit_display.title "Tor-rÃ¡s">
+<!ENTITY torbutton.circuit_display.new_circuit "NÃ½ rÃ¡s fyrir Ã¾etta vefsvÃ¦Ã°i">
diff --git a/src/chrome/locale/is/torbutton.properties b/src/chrome/locale/is/torbutton.properties
index 701209ba..81fc5305 100644
--- a/src/chrome/locale/is/torbutton.properties
+++ b/src/chrome/locale/is/torbutton.properties
@@ -1,27 +1,58 @@
-torbutton.panel.tooltip.disabled = Click to enable Tor
-torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.label.disabled = Tor Disabled
-torbutton.panel.label.enabled = Tor Enabled
-extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.external.title = Load external content?
-torbutton.popup.external.app = An external application is needed to handle:\n\n
-torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-torbutton.popup.launch = Launch application
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = Ã?Ã¾ekkt IP-tala
+torbutton.circuit_display.onion_site = Onion-vefsvÃ¦Ã°i
+torbutton.circuit_display.this_browser = Ã?essi vafri
+torbutton.circuit_display.relay = Relay
+torbutton.circuit_display.tor_bridge = BrÃº
+torbutton.circuit_display.unknown_country = Ã?Ã¾ekkt land
+torbutton.circuit_display.guard = Guard
+torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+torbutton.circuit_display.learn_more = LÃ¦ra meira
+torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
+torbutton.panel.tooltip.disabled = Smelltu til aÃ° virkja Tor
+torbutton.panel.tooltip.enabled = Smelltu til aÃ° afvirkja Tor
+torbutton.panel.label.disabled = Tor Ã³virkt
+torbutton.panel.label.enabled = Tor virkt
+extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton ÃºtbÃ½r hnapp til uppsetningar Ã¡ stillingum Tor svo aÃ° einfalt og hraÃ°virkt sÃ© aÃ° hreinsa Ãºt Ã¶ll gÃ¶gn vegna einkavafurs.
+torbutton.popup.external.title = SÃ¦kja utanaÃ°komandi skrÃ¡artegund?
+torbutton.popup.external.app = Tor-vafrinn getur ekki birt Ã¾essa skrÃ¡. Ã?Ãº verÃ°ur aÃ° opna hana meÃ° Ã¶Ã°ru forriti.\n\n
+torbutton.popup.external.note = Sumar skrÃ¡artegundir geta lÃ¡tiÃ° forrit tengjast netinu Ã¡n Ã¾ess aÃ° fara Ã gegnum Tor.
+torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n
+torbutton.popup.launch = NÃ¡ Ã skrÃ¡
 torbutton.popup.cancel = HÃ¦tta viÃ°
-torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.dontask = HlaÃ°a sjÃ¡lfkrafa inn skrÃ¡m hÃ©Ã°an Ã frÃ¡
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.title.prompt_torbrowser = MikilvÃ¦gar upplÃ½singar um Tor-hnappinn
 torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.popup.short_torbrowser = MikilvÃ¦gar upplÃ½singar um Tor-hnappinn!\n\nTor-hnappurinn er nÃºna alltaf virkur.\n\nSmelltu Ã¡ Tor-hnappinn til aÃ° sjÃ¡ nÃ¡nar.
 
-torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = ViÃ°bÃ¦tur eins og til dÃ¦mis Flash geta skaÃ°aÃ° friÃ°helgi Ã¾Ãna og gagnaleynd.\n\nÃ?Ã¦r geta einnig fariÃ° framhjÃ¡ Tor til aÃ° gefa upp staÃ°setningu Ã¾Ãna og IP-vistfang.\n\nErtu viss um aÃ° Ã¾Ãº viljir virkja viÃ°bÃ¦tur?\n\n
+torbutton.popup.never_ask_again = Ekki spyrja mig aftur
+torbutton.popup.confirm_newnym = Tor-vafrinn mun nÃºna loka Ã¶llum flipum og gluggum. Allar setur Ã¡ vefsvÃ¦Ã°um munu tapast.\n\nÃ? aÃ° endurrÃ¦sa Tor-vafrann til aÃ° nÃºllstilla auÃ°kenniÃ° Ã¾itt?\n\n
+
+torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out!
+torbutton.slider_notification_button = Opna Ã¶ryggisstillingar
+
+torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Ekki nÃºna
+canvas.notNowAccessKey=N
+canvas.allow=Leyfa Ã framtÃÃ°inni
 canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Aldrei fyrir Ã¾etta vefsvÃ¦Ã°i (mÃ¦lt meÃ° Ã¾essu)
 canvas.neverAccessKey=e
+
+# Profile/startup error messages. Strings are kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+profileProblemTitle=VandamÃ¡l viÃ° %S sniÃ°
+profileReadOnly=You cannot run %S from a read-only file system.  Please copy %S to another location before trying to use it.
+profileReadOnlyMac=You cannot run %S from a read-only file system.  Please copy %S to your Desktop or Applications folder before trying to use it.
+profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again.
+profileMigrationFailed=YfirfÃ¦rsla Ã¡ fyrirliggjandi %S sniÃ°inu Ã¾Ãnu mistÃ³kst.\nNÃ½jar stillingar verÃ°a notaÃ°ar.
+
+# .Onion Page Info prompt.  Strings are kept here for ease of translation.
+pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
+pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd
index a016f6bb..f373ceb1 100644
--- a/src/chrome/locale/it/aboutTor.dtd
+++ b/src/chrome/locale/it/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Info su Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "ATTENZIONE: questo browser non Ã¨ aggiornato.">
-<!ENTITY aboutTor.outOfDateTorOff.label "INOLTRE, questo browser non Ã¨ aggiornato.">
-<!ENTITY aboutTor.outOfDate2.label "Clicca sulla cipolla e scegli &quot;Scarica Aggiornamento Tor Browser Bundle&quot;.">
-
-<!ENTITY aboutTor.check.label "Test Impostazioni della Rete Tor">
-
-<!ENTITY aboutTor.success.label "Benvenuto nel browser TOR">
-<!ENTITY aboutTor.success2.label "Connesso alla rete TOR.">
-<!ENTITY aboutTor.success3.label "Ora sei libero di navigare in internet anonimamente.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "Qualcosa Ã¨ Andato Storto!">
 <!ENTITY aboutTor.failure2.label "Tor non sta funzionando su questo browser.">
 
-<!ENTITY aboutTor.search.label "Cerca">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Ulteriori Info:">
-<!ENTITY aboutTor.torInfo2.label "Nazione &amp; 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 adesso?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor NON Ã¨ tutto ciÃ² che ti serve per navigare anonimamente! Potresti aver bisogno di cambiare le tue abitudini di navigazione per accertarti che la tua identitÃ  rimanga al sicuro.">
-<!ENTITY aboutTor.whatnext.label "Consigli Per Restare Anonimo Â»">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Domande?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Manuale utente di Tor Browser">
-<!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 "Aiutaci in Vari Modi Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Fai una Donazione Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!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";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/it/browserOnboarding.properties b/src/chrome/locale/it/browserOnboarding.properties
new file mode 100644
index 00000000..c3169b1d
--- /dev/null
+++ b/src/chrome/locale/it/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Benvenuto
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Privacy
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Esplora
+
+onboarding.tour-tor-security=Sicurezza
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Servizi Onion
+onboarding.tour-tor-onion-services.title=Servizi Onion
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties
index aa1279b7..3f8f2bac 100644
--- a/src/chrome/locale/it/torbutton.properties
+++ b/src/chrome/locale/it/torbutton.properties
@@ -5,8 +5,8 @@ torbutton.circuit_display.this_browser = Questo browser
 torbutton.circuit_display.relay = Ripetitore
 torbutton.circuit_display.tor_bridge = Bridge
 torbutton.circuit_display.unknown_country = Paese sconosciuto
-torbutton.circuit_display.guard = Guard
-torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+torbutton.circuit_display.guard = Guardia
+torbutton.circuit_display.guard_note = Il tuo nodo [Guardia] non deve cambiare.
 torbutton.circuit_display.learn_more = Per saperne di piÃ¹
 torbutton.content_sizer.margin_tooltip = Il browser Tor aggiunge questo margine per rendere l'ampiezza e altezza della tua finestra meno distintiva, cosÃ¬ si riduce la possibilitÃ  di che tu sia tracciato in linea.
 torbutton.panel.tooltip.disabled = Fai clic per attivare Tor
@@ -40,7 +40,7 @@ torbutton.maximize_warning = Massimizzando Tor Browser, i siti web possono risal
 canvas.siteprompt=Questo sito (%S) ha tentato di estrarre i dati di immagine HTML5 canvas, che possono essere utilizzati per identificare in modo univoco il computer.\n\nPermettere a Tor Browser di estrarre l'immagine HTML5 canvas per questo sito?
 canvas.notNow=Non ora
 canvas.notNowAccessKey=N
-canvas.allow=acconsenti in futuro
+canvas.allow=Acconsenti in futuro
 canvas.allowAccessKey=A
 canvas.never=Mai per questo sito (raccomandato)
 canvas.neverAccessKey=e
diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd
index 9d1b9c91..661cfdb9 100644
--- a/src/chrome/locale/ja/aboutTor.dtd
+++ b/src/chrome/locale/ja/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Torã?«ã?¤ã??ã?¦">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "è¦å??ï¼?ã??ã?®ã??ã?©ã?¦ã?¶ã?¯å?¤ã??ã??ã?¼ã?¸ã?§ã?³ã?§ã??ã??">
-<!ENTITY aboutTor.outOfDateTorOff.label "ã?¾ã??ã??ã??ã?®ã??ã?©ã?¦ã?¶ã?¯å?¤ã??ã??ã?¼ã?¸ã?§ã?³ã?§ã??ã??">
-<!ENTITY aboutTor.outOfDate2.label "Onion ã??ã?¯ã?ªã??ã?¯ã??ã?¦ Tor Browser ã?®ã?¢ã??ã??ã??ã?¼ã??ã??ç¢ºèª?ã??ã?¦ã??ã? ã??ã??ã??">
-
-<!ENTITY aboutTor.check.label "Torã?®ã??ã??ã??ã?¯ã?¼ã?¯è¨å®?ã??ã??ã?¹ã??ã??ã??">
-
-<!ENTITY aboutTor.success.label "ï¼´ï½?ï½? ï¼¢ï½?ï½?ï½?ï½?ï½?ï½?ã?«ã??ã??ã??ã??">
-<!ENTITY aboutTor.success2.label "Torã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã?¾ã??ã??">
-<!ENTITY aboutTor.success3.label "ç?¾å?¨ã??è?ªç?±ã?«å?¿å??ã?§ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã??ã??ã?©ã?¦ã?ºå?ºæ?¥ã?¾ã??ã??">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "ä½?ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??ï¼?">
 <!ENTITY aboutTor.failure2.label "Torã?¯ã??ã??ã?®ã??ã?©ã?¦ã?¶ã?§ã?¯å??ä½?ã??ã?¾ã??ã??ã??">
 
-<!ENTITY aboutTor.search.label "æ¤?ç´¢">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!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.torbrowser_user_manual_questions.label "è³ªå??ã??ã??ã??ã?¾ã??ã??ï¼?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser ã?¦ã?¼ã?¶ã?¼ã??ã??ã?¥ã?¢ã?«">
-<!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 "ã??ã?©ã?³ã??ã?£ã?¢ã?«å¿?é¡?ã??ã?? &gt;&gt;">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "å¯?ä»?ã??ã?? Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "Tor Projectã?¯ã??ã?ªã?³ã?©ã?¤ã?³ã?®å?¿å??æ?§ã?¨ã??ã?©ã?¤ã??ã?·ã?¼ã?®ç ?ç©¶ã?»é??ç?ºã?»æ??è?²ã??å°?é??ã?«è¡?ã??ç±³å?½ã?®501(c)(3)é??å?¶å?©å?£ä½?ã?§ã??ã??">
-<!ENTITY aboutTor.learnMore.label "Tor Projectã?«é?¢ã??ã??è©³ç´°  Â»">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/ja/browserOnboarding.properties b/src/chrome/locale/ja/browserOnboarding.properties
new file mode 100644
index 00000000..b5b7601b
--- /dev/null
+++ b/src/chrome/locale/ja/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=ã??ã??ã??ã??
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=ã??ã?©ã?¤ã??ã?·ã?¼
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=æ?¢ç´¢
+
+onboarding.tour-tor-security=ã?»ã?ã?¥ã?ªã??ã?£
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion Services
+onboarding.tour-tor-onion-services.title=Onion Services
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd
index 65b9b769..83ea0c93 100644
--- a/src/chrome/locale/ko/aboutTor.dtd
+++ b/src/chrome/locale/ko/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Torì?? ë??í?´ì??">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "ì£¼ì??: í??ì?¬ êµ¬ë²?ì ? ë¸?ë?¼ì?°ì ?ë¥¼ ì?¬ì?©í??ê³  ê³?ì?ë??ë?¤.">
-<!ENTITY aboutTor.outOfDateTorOff.label "ë??í??,  í??ì?¬ êµ¬ë²?ì ? ë¸?ë?¼ì?°ì ?ë¥¼ ì?¬ì?©í??ê³  ê³?ì?ë??ë?¤.">
-<!ENTITY aboutTor.outOfDate2.label "onionì?? í?´ë¦í??ê³  Tor Browser ì??ë?°ì?´í?¸ ì²´í?¬ë¥¼ ì? í??í??ì?¸ì??.">
-
-<!ENTITY aboutTor.check.label "Tor ë?¤í?¸ì??í?¬ ì?¤ì ? í??ì?¤í?¸">
-
-<!ENTITY aboutTor.success.label "Tor ë¸?ë?¼ì?°ì ?ì?? ì?¤ì?  ê²?ì?? í??ì??í?©ë??ë?¤">
-<!ENTITY aboutTor.success2.label "Tor ë?¤í?¸ì??í?¬ì?? ì?°ê²°ë??ì??ì?µë??ë?¤.">
-<!ENTITY aboutTor.success3.label "ì?´ì ? ì??ì? ë¡ê²? ì?µëª?ì?¼ë¡? ì?¸í?°ë?·ì?? í??ì??í?  ì?? ì??ì?µë??ë?¤.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "ë?ê°? ì??ëª»ë??ì??ì?µë??ë?¤!">
 <!ENTITY aboutTor.failure2.label "Torë?? ì?´ ë¸?ë?¼ì?°ì ?ì??ì?? ì??ë??í??ì§? ì??ì?µë??ë?¤.">
 
-<!ENTITY aboutTor.search.label "ê²?ì??">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "ì¶?ê°? ì ?ë³´ :">
-<!ENTITY aboutTor.torInfo2.label "êµê°? &amp; IP ì£¼ì?? :">
-<!ENTITY aboutTor.torInfo3.label "ì¶?êµ¬ ë?¸ë??: ">
-<!ENTITY aboutTor.torInfo4.label "ì?´ ì??ë²?ë?? ë°©ë¬¸ì??ì?? ë??í?? ì ?ë³´ë¥¼ ê¸°ë¡?í??ì§? ì??ì?µë??ë?¤.">
-<!ENTITY aboutTor.whatnextQuestion.label "ê·¸ ë?¤ì??ì???">
-<!ENTITY aboutTor.whatnextAnswer.label "Torë?? ì??ë²½í?? ì?µëª? ë¸?ë?¼ì?°ì§?ì?? ë³´ì?¥í??ì§? ì??ì?µë??ë?¤! ë?°ë?¼ì?? ì? ë¶?ì?? ì??ì ?í??ê²? ì? ì§?í??ê¸° ì??í?´ì??ë?? ë¸?ë?¼ì?°ì§? ì?µê´?ì?? ë°?ê¾¸ì??ì?¼ í?©ë??ë?¤.">
-<!ENTITY aboutTor.whatnext.label "ì?µëª?ì?¼ë¡? ì??ì§±ê±°ë¦´ ë??ì?? í?? &gt;&gt;">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "ì§?ë¬¸ì?´ ì??ì?¼ì? ê°?ì???">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor ë¸?ë?¼ì?°ì ? ì?¬ì?©ì?? ì?¤ëª?ì??">
-<!ENTITY aboutTor.helpInfo1.label "ì?¬ë?¬ë¶?ë?? ë??ì?¸ ì?? ì??ì?µë??ë?¤!">
-<!ENTITY aboutTor.helpInfo2.label "ì?¬ë?¬ë¶?ì?´ Tor ë?¤í?¸ì??í?¬ë¥¼ ë³´ë?¤ ë¹ ë¥´ê³  ê°?í??ê²? ë§?ë?¤ ì?? ì??ë?? ë°©ë²?ì?´ ì??ì?µë??ë?¤.">
-<!ENTITY aboutTor.helpInfo3.label "Tor ì¤?ê³? ì??ë²? node ì?¤í?? Â»">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "ì??ì?? ë´?ì?¬ë¡? Tor ë??ê¸° Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "í??ì??í??ê¸° Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!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.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/ko/browserOnboarding.properties b/src/chrome/locale/ko/browserOnboarding.properties
new file mode 100644
index 00000000..93f3774d
--- /dev/null
+++ b/src/chrome/locale/ko/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=ì?¬ì??í??
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security= ë³´ì??
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion ì??ë¹?ì?¤
+onboarding.tour-tor-onion-services.title=Onion ì??ë¹?ì?¤
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/nb/aboutDialog.dtd b/src/chrome/locale/nb/aboutDialog.dtd
new file mode 100644
index 00000000..78293397
--- /dev/null
+++ b/src/chrome/locale/nb/aboutDialog.dtd
@@ -0,0 +1,19 @@
+<!ENTITY project.start           "&amp;bransShortName; blir utviklet av">
+<!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
+<!ENTITY project.tpoLink         "&vendorShortName;">
+<!ENTITY project.end             ", en veldedig organisasjon som jobber for Ã¥ forsvare ditt personvern og din frihet pÃ¥ nett.">
+
+<!ENTITY help.start              "Vil du bidra?">
+<!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://www.torproject.org/donate/donate.html.en -->
+<!ENTITY help.donateLink         "Doner">
+<!ENTITY help.or                 "eller">
+<!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en -->
+<!ENTITY help.getInvolvedLink    "involver deg">
+<!ENTITY help.end                "!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en -->
+<!ENTITY bottomLinks.questions   "SpÃ¸rsmÃ¥l?">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/getinvolved/relays -->
+<!ENTITY bottomLinks.grow        "Hjelp Tor-nettverket Ã¥ vokse!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
+<!ENTITY bottomLinks.license  "Lisensinformasjon">
+<!ENTITY tor.TrademarkStatement   "&quot;Tor&quot; og &quot;LÃ¸k-logoen&quot; er registrerte varemerker tilhÃ¸rende the Tor Project, Inc.">
diff --git a/src/chrome/locale/nb/aboutTBUpdate.dtd b/src/chrome/locale/nb/aboutTBUpdate.dtd
new file mode 100644
index 00000000..919a7f7b
--- /dev/null
+++ b/src/chrome/locale/nb/aboutTBUpdate.dtd
@@ -0,0 +1,6 @@
+<!ENTITY aboutTBUpdate.title "Oppdatering av Tor-nettleseren">
+<!ENTITY aboutTBUpdate.updated "Tor-nettleseren har blitt oppdatert.">
+<!ENTITY aboutTBUpdate.linkPrefix "For den mest oppdaterte informasjonen om denne utgivelsen,">
+<!ENTITY aboutTBUpdate.linkLabel  "besÃ¸k vÃ¥rt nettsted">
+<!ENTITY aboutTBUpdate.linkSuffix ".">
+<!ENTITY aboutTBUpdate.changeLogHeading "Endringslogg:">
diff --git a/src/chrome/locale/nb/aboutTor.dtd b/src/chrome/locale/nb/aboutTor.dtd
index 9f14022b..7b37ddbe 100644
--- a/src/chrome/locale/nb/aboutTor.dtd
+++ b/src/chrome/locale/nb/aboutTor.dtd
@@ -1,47 +1,25 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Om 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.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
+<!ENTITY aboutTor.failure.label "Noe gikk galt!">
+<!ENTITY aboutTor.failure2.label "Tor fungerer ikke i denne nettleseren.">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.success.label "Congratulations!">
-<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
-<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
-<!ENTITY aboutTor.failure.label "Something Went Wrong!">
-<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
-<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "SpÃ¸rsmÃ¥l?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
+<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search";>
-<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
-
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
-<!ENTITY aboutTor.torInfo3.label "Exit Node:">
-<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
-<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
-<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»">
-<!ENTITY aboutTor.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.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.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/nb/aboutTor.properties b/src/chrome/locale/nb/aboutTor.properties
index 02088f01..b72d167f 100644
--- a/src/chrome/locale/nb/aboutTor.properties
+++ b/src/chrome/locale/nb/aboutTor.properties
@@ -2,14 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+aboutTor.searchDDG.privacy=SÃ¸k <a href="%1$S">sikkert</a> med <a href="%2$S">DuckDuckGo</a>.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.donationBanner.donate=Doner nÃ¥.
+
+aboutTor.donationBanner.slogan=Tor: PÃ¥driver for digital motstandsdyktighet
+aboutTor.donationBanner.mozilla=Gi i dag og Mozilla vil matche bidraget ditt!
+
+aboutTor.donationBanner.tagline1=Beskyttelse av journalister, flÃ¸yteblÃ¥sere og aktivister siden 2006
+aboutTor.donationBanner.tagline2=Verdensomspennende nettverksfrihet
+aboutTor.donationBanner.tagline3=Frihet pÃ¥ nett
+aboutTor.donationBanner.tagline4=Grobunn til verdensomspennende ytringsfrihet
+aboutTor.donationBanner.tagline5=Beskytter privatlivet til millioner hver dag
diff --git a/src/chrome/locale/nb/brand.dtd b/src/chrome/locale/nb/brand.dtd
index 59f665e8..7ae614c1 100644
--- a/src/chrome/locale/nb/brand.dtd
+++ b/src/chrome/locale/nb/brand.dtd
@@ -2,7 +2,14 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY  brandShortName        "Tor Browser">
-<!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  brandShorterName      "Tor-nettleseren">
+<!ENTITY  brandShortName        "Tor-nettleseren">
+<!ENTITY  brandFullName         "Tor-nettleseren">
+<!ENTITY  vendorShortName       "Tor-prosjektet">
+<!ENTITY  trademarkInfo.part1   "Firefox og Firefox-logene er varemarker tilhÃ¸rende Mozilla-stiftelsen.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Klikk for Ã¥ laste inn installerte systemtillegg">
+<!ENTITY plugins.installed.enable "Skru pÃ¥ programtillegg">
+<!ENTITY plugins.installed.disable "Skru av programtillegg">
+<!ENTITY plugins.installed.disable.tip "Klikk for Ã¥ blokkere innlasting av systemtillegg">
diff --git a/src/chrome/locale/nb/brand.properties b/src/chrome/locale/nb/brand.properties
index f63def38..3101ebc6 100644
--- a/src/chrome/locale/nb/brand.properties
+++ b/src/chrome/locale/nb/brand.properties
@@ -2,14 +2,15 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShortName=Tor Browser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+brandShorterName=Tor-nettleseren
+brandShortName=Tor-nettleseren
+brandFullName=Tor-nettleseren
+vendorShortName=Tor-prosjektet
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Firefox Start, en rask startside med innebygd sÃ¸k
+homePageImport=Importer startsiden din fra %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=Utvalg av startsider
+homePageMigrationDescription=Velg startsiden du vil bruke:
 
-syncBrandShortName=Sync
+syncBrandShortName=Synkroniser
diff --git a/src/chrome/locale/nb/browserOnboarding.properties b/src/chrome/locale/nb/browserOnboarding.properties
new file mode 100644
index 00000000..49968370
--- /dev/null
+++ b/src/chrome/locale/nb/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Personvern
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=Sikkerhet
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=LÃ¸k-tjenester
+onboarding.tour-tor-onion-services.title=LÃ¸k-tjenester
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd
index 7e5150f8..1b58f104 100644
--- a/src/chrome/locale/nb/torbutton.dtd
+++ b/src/chrome/locale/nb/torbutton.dtd
@@ -1,13 +1,20 @@
-<!ENTITY torbutton.context_menu.new_identity "Ny Identitet">
+<!ENTITY torbutton.context_menu.new_identity "Ny identitet">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.networksettings "Ã?pne nettverksinnstillinger...">
-<!ENTITY torbutton.context_menu.downloadUpdate "Last ned Tor Browser Bundle oppdatering...">
+<!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets for denne siden">
+<!ENTITY torbutton.context_menu.new_circuit_key "C">
+<!ENTITY torbutton.context_menu.preferences "Sikkerhetsinnstillingerâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
+<!ENTITY torbutton.context_menu.networksettings "Nettverksinnstillinger for Torâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
+<!ENTITY torbutton.context_menu.downloadUpdate "Se etter oppdatering for Tor-nettleserenâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "Informasjonskapsel Beskyttelser">
+<!ENTITY torbutton.context_menu.cookieProtections "Informasjonskapsels-beskyttelseâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.button.tooltip "Klikk for Ã¥ initialisere Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Gjenopprett standard">
-<!ENTITY torbutton.cookiedialog.title "AdministrÃ©r Informasjonskapslenes Beskyttelser">
+<!ENTITY torbutton.button.tooltip "Klikk for Ã¥ igangsette Torbutton">
+<!ENTITY torbutton.prefs.security_settings "Sikkerhetsinnstillinger for Tor-nettleseren">
+<!ENTITY torbutton.prefs.restore_defaults "Gjenopprett forvalg">
+<!ENTITY torbutton.prefs.custom_warning "Dine nettleserinnstillinger har fÃ¸rt med seg uvanlige sikkerhetsvalg. Av sikkerhet- og personverns-hensyn anbefaler vi at du velger en av de forvalgte sikkerhetsnivÃ¥ene.">
+<!ENTITY torbutton.cookiedialog.title "Administrer beskyttelse av informasjonskapsler">
 <!ENTITY torbutton.cookiedialog.lockCol "Beskyttet">
 <!ENTITY torbutton.cookiedialog.domainCol "Vert">
 <!ENTITY torbutton.cookiedialog.nameCol "Navn">
@@ -15,8 +22,30 @@
 <!ENTITY torbutton.cookiedialog.protectCookie "Beskytt Informasjonskapsel">
 <!ENTITY torbutton.cookiedialog.removeCookie "Fjern Informasjonskapsel">
 <!ENTITY torbutton.cookiedialog.unprotectCookie "Ikke Beskytt Informasjonskapsel">
-<!ENTITY torbutton.cookiedialog.removeAllBut "Fjern Alle Bortsett Fra Beskyttede">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "Beskytt Nye Informasjonskapsler">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ikke Beskytt Nye Informasjonskapsler">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Fjern alle bortsett fra beskyttede">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Beskytt nye informasjonskapsler">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ikke beskytt nye informasjonskapsler">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Begrens tredjeparts informasjonskapsler og andre sporingsdata.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Endre detaljer som skiller deg fra andre Tor Browser brukere.">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Hold denne boksen avhuket for Ã¥ forebygge at ulike nettleserfunksjoner blir misbrukt til Ã¥ spore deg nÃ¥r du surfer pÃ¥ nettet. Modifiserte funksjoner inkluderer blob-nettadresser, kringkastinskanaler, nettleserens mellomlager, informasjonskapsler, favicon, HTTP-autentiserings overskrifter, link preconnects, localstorage , Mediasource-nettadresser, OCSP-forespÃ¸rsler, SharedWorkers og TLS Ã¸ktbilletter.">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Endre detaljer som skiller deg fra andre brukere av Tor-nettleseren.">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "La denne avkryssingsboksen vÃ¦re utkrysset for Ã¥ skjule ting som kan vÃ¦re unikt med deg fra nettsteder, inkludert datamaskinens ytelse, tastaturoppsett , lokale, plasseringen av- og listen over  installerte programtillegg, nettverksstatus, skjermretning , skjermstÃ¸rrelse , sidespesifikke forstÃ¸rrelsesnivÃ¥er , filtyper som stÃ¸ttes, systemfarger og WebGL-evner.">
+<!ENTITY torbutton.prefs.sec_caption "SikkerhetsnivÃ¥">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "Sikkerhetsglidebryteren lar deg skru av forskjellige nettleserfunksjoner som kan eksponere deg for risiko.">
+<!ENTITY torbutton.prefs.sec_standard_label "Forvalg">
+<!ENTITY torbutton.prefs.sec_standard_description "Alle Tor-nettleser- og nettside-funksjoner er pÃ¥.">
+<!ENTITY torbutton.prefs.sec_safer_label "Tryggere">
+<!ENTITY torbutton.prefs.sec_safer_description "Skrur av nettsidefunksjoner som ofte er farlige, som gjÃ¸r at noen sider blir skadelidende.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "PÃ¥ den tryggere innstillingen:">
+<!ENTITY torbutton.prefs.sec_safest_label "Tryggest">
+<!ENTITY torbutton.prefs.sec_safest_description "Tillater bare nettsidefunksjoner som kreves for statiske sider og grunnleggende tjenester. Disse endringene har innvirkning pÃ¥ bilder, media, og skript.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "PÃ¥ den tryggeste innstillingen:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "LÃ¦r mer">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript er avskrudd pÃ¥ sider som ikke er HTTPS.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript er som forvalg slÃ¥tt av for alle nettsteder.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Noen skrifter og mattesymboler er avskrudd.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Noen skrifter, ikoner, mattesymboler og bilder er avskrudd.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Lyd og video (HTML5-media) mÃ¥ klikkes for Ã¥ spilles av.">
+<!ENTITY torbutton.circuit_display.title "Tor Krets">
+<!ENTITY torbutton.circuit_display.new_circuit "Ny Krets for denne siden">
diff --git a/src/chrome/locale/nb/torbutton.properties b/src/chrome/locale/nb/torbutton.properties
index 12ad8eff..b1942b4a 100644
--- a/src/chrome/locale/nb/torbutton.properties
+++ b/src/chrome/locale/nb/torbutton.properties
@@ -1,27 +1,58 @@
+torbutton.circuit_display.internet = Internett
+torbutton.circuit_display.ip_unknown = Ukjent IP
+torbutton.circuit_display.onion_site = LÃ¸k-side
+torbutton.circuit_display.this_browser = Denne nettleseren
+torbutton.circuit_display.relay = RelÃ¨
+torbutton.circuit_display.tor_bridge = Bro
+torbutton.circuit_display.unknown_country = Ukjent land
+torbutton.circuit_display.guard = Vakt
+torbutton.circuit_display.guard_note = Din [Vakt] node kan ikke endres.
+torbutton.circuit_display.learn_more = LÃ¦r mer
+torbutton.content_sizer.margin_tooltip = Tor nettleseren legger til denne marginen for Ã¥ lage bredden og hÃ¸yden pÃ¥ ditt vindu mindre unikt, og reduserer slik muligheten for andre til Ã¥ spore deg pÃ¥ nett.
 torbutton.panel.tooltip.disabled = Klikk for Ã¥ aktivere Tor
-torbutton.panel.tooltip.enabled = Klikk for Ã¥ deaktivere Tor
-torbutton.panel.label.disabled = Tor er deaktivert
+torbutton.panel.tooltip.enabled = Klikk for Ã¥ skru av Tor
+torbutton.panel.label.disabled = Tor er avskrudd
 torbutton.panel.label.enabled = Tor er aktivert
-extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton tilbyr en knapp til Ã¥ konfigurere Tor-innstillinger, samt rask og enkel tilgang til Ã¥ slette privat nettleserhistorikk.
-torbutton.popup.external.title = Laste eksternt innhold?
-torbutton.popup.external.app = Et eksternt program er nÃ¸dvendig for Ã¥ hÃ¥ndtere:\n\n
-torbutton.popup.external.note = \n\nMERK: Eksterne program er IKKE Tor-sikker som standard og kan rÃ¸pe deg!\n
-torbutton.popup.external.suggest = \nHvis du ikke vet om denne filen er trygg, bÃ¸r du enten lagre og Ã¥pne den frakoblet, eller i en virtuell maskin,\neventuelt vurdere Ã¥ bruker en transparent Torproxy som Tails LiveCD eller torsocks.\n
-torbutton.popup.launch = Start program
+extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton tilbyr en knapp til Ã¥ sette opp Tor-innstillinger, samt rask og enkel tilgang til Ã¥ slette privat nettleserhistorikk.
+torbutton.popup.external.title = Last ned en ekstern filtype?
+torbutton.popup.external.app = Tor-nettleseren kan ikke Ã¥pne denne filen. Du er nÃ¸dt til Ã¥ Ã¥pne den med et annet program.\n
+torbutton.popup.external.note = Noen filtyper kan forÃ¥rsake at programmer kobler til internett uten Ã¥ bruke Tor.\n
+torbutton.popup.external.suggest = For Ã¥ vÃ¦re pÃ¥ den sikre siden, bÃ¸r du kun Ã¥pne nedlastede filer nÃ¥r du frakoblet internett, eller bruke en Tor Live CD som Tails.\n
+torbutton.popup.launch = Last ned fil
 torbutton.popup.cancel = Avbryt
-torbutton.popup.dontask = Start alltid programmer fra nÃ¥ av
+torbutton.popup.dontask = Last ned filer automatisk fra nÃ¥ av
 torbutton.popup.prompted_language = For Ã¥ gi deg et bedre personvern, kan Torbutton spÃ¸rre om en engelsksprÃ¥klig versjon av nettsider. Dette kan resultere i at nettsider du foretrekker Ã¥ lese pÃ¥ morsmÃ¥let ditt vises pÃ¥ engelsk istedet.\n\nVil du spÃ¸rre om engelsksprÃ¥klige nettsider for Ã¥ bedre personvernet?
-torbutton.popup.no_newnym = Torbutton kan ikke trygt gi deg en ny identitet. Den har ikke tilgang til Tor Control Port.\n\nKjÃ¸rer du Tor Browser Bundle?
-torbutton.title.prompt_torbrowser = Viktig Torbutton informasjon
-torbutton.popup.prompt_torbrowser = Torbutton fungerer annerledes nÃ¥. Du kan ikke skru den av lenger.\n\nVi gjorde denne forandringen fordi det ikke er sikkert Ã¥ bruke Torbutton i en nettleser som ogsÃ¥ brukers til annen surfing enn Tor. \nDet var for mange bugs der til at vi kunne fikse det pÃ¥ en annen mÃ¥te.\n\nHvis du Ã¸nsker Ã¥ bruke Firefox normalt, bÃ¸r du avinstallere Torbutton og laste ned Tor Browser Bundle. Personvernsinnstillingene til Tor Browser er ogsÃ¥ overlegen en normal Firefox, selv nÃ¥r Firefox brukes med Torbutton.\n\nFor Ã¥ fjerne Torbutton, gÃ¥ til VerktÃ¸y->Tillegg->Utvidelser og klikk pÃ¥ Fjern-knappen ved siden av Torbutton.
-torbutton.popup.short_torbrowser = Viktig Torbutton informasjon!\n\nTorbutton er alltid aktivert nÃ¥.\n\nKlikk pÃ¥ Torbutton for mer informasjon.
+torbutton.popup.no_newnym = Torbutton kan ikke trygt gi deg en ny identitet. Den har ikke tilgang til Tor-kontrollporten.\n\nKjÃ¸rer du Tor-nettleserpakken?
+torbutton.title.prompt_torbrowser = Viktig Torbutton-informasjon
+torbutton.popup.prompt_torbrowser = Torbutton fungerer annerledes nÃ¥. Du kan ikke skru den av lenger.\n\nVi gjorde denne forandringen fordi det ikke er sikkert Ã¥ bruke Torbutton i en nettleser som ogsÃ¥ brukers til annen surfing enn Tor. \nDet var for mange feil der til at vi kunne fikse det pÃ¥ en annen mÃ¥te.\n\nHvis du Ã¸nsker Ã¥ bruke Firefox normalt, bÃ¸r du avinstallere Torbutton og laste ned Tor-nettleserforpakningen. Personvernsinnstillingene til Tor-nettleseren er ogsÃ¥ overlegen forvalget i Firefox, selv nÃ¥r Firefox brukes med Torbutton.\n\nFor Ã¥ fjerne Torbutton, gÃ¥ til VerktÃ¸y->Tillegg->Utvidelser og klikk pÃ¥ Fjern-knappen ved siden av Torbutton.
+torbutton.popup.short_torbrowser = Viktig Torbutton-informasjon!\n\nTorbutton er alltid aktivert nÃ¥.\n\nKlikk pÃ¥ Torbutton for mer informasjon.
 
 torbutton.popup.confirm_plugins = Nettlesertillegg som f.eks Flash kan skade personvernet og anonymiteten din.\n\nDe kan ogsÃ¥ omgÃ¥ Tor og dermed avslÃ¸re din nÃ¥vÃ¦rende plassering og IP-adresse.\n\nEr du sikker pÃ¥ at du vil aktivere nettlesertillegg?\n\n
 torbutton.popup.never_ask_again = Ikke spÃ¸r meg igjen
+torbutton.popup.confirm_newnym = TOR-nettleseren vil stenge alle vinduer og faner. Alle nettstedeÃ¸kter vil gÃ¥ tapt.\n\n\nRestart TOR-nettleseren nÃ¥ for Ã¥ tilbakestille din identitet?\n\n
+
+torbutton.slider_notification = Den grÃ¸nne lÃ¸k-menyen har nÃ¥ en sikkerhetsglidebryter som lar deg justere ditt sikkerhetsnivÃ¥. Sjekk den ut!
+torbutton.slider_notification_button = Ã?pne sikkerhetsinnstillinger
+
+torbutton.maximize_warning = Ã? blÃ¥se opp vinduet Tor-nettleseren befinner seg i  til full stÃ¸rrelse gir nettsteder muligheten til Ã¥ fastslÃ¥ din skjermopplÃ¸sning, som igjen kan brukes til Ã¥ spore deg. Vi anbefaler at du lar Tor-nettleservinduet vÃ¦re i orginal stÃ¸rrelse.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Denne nettsiden (%S) forsÃ¸kte Ã¥ fÃ¥ tilgang til bildedata pÃ¥ et lerret. Siden bildedata pÃ¥ lerret kan bli brukt til Ã¥ avlsÃ¸re informasjon om datamaskinen din, ble blank bildedata returnert denne gangen.
-canvas.allow=Tillat i framtiden
+canvas.siteprompt=Denne nettsiden (%S) prÃ¸vde Ã¥ pakke ut HTML5-canvas-billeddata, hvilket kan brukes til Ã¥ tilkjennegi din datamaskin spesifikt i identifiseringsÃ¸yemed.\n\nSkal Tor-nettleseren tillate denne nettsiden Ã¥ pakke ut HTML5-canvas-billeddata?
+canvas.notNow=Ikke nÃ¥
+canvas.notNowAccessKey=N
+canvas.allow=Tillat i fremtiden
 canvas.allowAccessKey=A
-canvas.never=Aldri pÃ¥ denne siden
+canvas.never=Aldri for denne siden (anbefalt)
 canvas.neverAccessKey=e
+
+# Profile/startup error messages. Strings are kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+profileProblemTitle=%S profil-problem
+profileReadOnly=Du kan ikke kjÃ¸re %S fra et filsystem som bare er lesbart. Kopier %S til en annen plass fÃ¸r du prÃ¸ver Ã¥ bruke det.
+profileReadOnlyMac=Du kan ikke kjÃ¸re %S fra et filsystem som bare er lesbart. Kopier %S til skrivebordet eller programmappa fÃ¸r du bruker det.
+profileAccessDenied=%S har ikke tilgang til endring av profilen. Juster filrettighetene og prÃ¸v igjen.
+profileMigrationFailed=Migrering av din eksisterende %S-profil mislykkes.\nNye innstillinger vil bli benyttet.
+
+# .Onion Page Info prompt.  Strings are kept here for ease of translation.
+pageInfo_OnionEncryptionWithBitsAndProtocol=Tilkobling kryptert (LÃ¸k Tjeneste, %1$S, %2$S bits nÃ¸kler, %3$S)
+pageInfo_OnionEncryption=Tilkobling kryptert (LÃ¸k Tjeneste)
diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd
index 95b19b9c..f1bb675c 100644
--- a/src/chrome/locale/nl/aboutTor.dtd
+++ b/src/chrome/locale/nl/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Over Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "Waarschuwing: deze browser is verouderd!">
-<!ENTITY aboutTor.outOfDateTorOff.label "BOVENDIEN is deze browser verouderd.">
-<!ENTITY aboutTor.outOfDate2.label "Klik op de ui en kies Controleer op Tor-browserupdate.">
-
-<!ENTITY aboutTor.check.label "Test Tor-netwerkinstellingen">
-
-<!ENTITY aboutTor.success.label "Welkom bij Tor-browser">
-<!ENTITY aboutTor.success2.label "Verbonden met het Tor-netwerk.">
-<!ENTITY aboutTor.success3.label "Je kan nu anoniem over het internet browsen.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "Er ging iets mis!">
 <!ENTITY aboutTor.failure2.label "Tor werkt niet in deze browser.">
 
-<!ENTITY aboutTor.search.label "Zoeken">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/";>
 
-<!ENTITY aboutTor.torInfo1.label "Bijkomende informatie:">
-<!ENTITY aboutTor.torInfo2.label "Land &amp; IP-adres:">
-<!ENTITY aboutTor.torInfo3.label "Exitnode:">
-<!ENTITY aboutTor.torInfo4.label "Deze server houdt geen enkele informatie over bezoekers bij.">
-<!ENTITY aboutTor.whatnextQuestion.label "Wat nu?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor is NIET alles wat je nodig hebt om anoniem te kunnen browsen. Mogelijk is het nodig dat je bepaalde browsegewoontes verandert om te verzekeren dat je identiteit veilig blijft.">
-<!ENTITY aboutTor.whatnext.label "Tips om anoniem te blijven Â»">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Vragen?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Gebruikershandleiding">
-<!ENTITY aboutTor.helpInfo1.label "Jij kan helpen!">
-<!ENTITY aboutTor.helpInfo2.label "Er zijn veel verschillende manieren hoe jij kan helpen het Tor-netwerk sneller en sterker te maken:">
-<!ENTITY aboutTor.helpInfo3.label "Draai een Tor-relaynode Â»">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Word vrijwilliger">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Doneer Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "Het Tor Project is een US 501(c)(3) non-profit voor onderzoek, ontwikkeling en 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";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/nl/browserOnboarding.properties b/src/chrome/locale/nl/browserOnboarding.properties
new file mode 100644
index 00000000..c5810bdb
--- /dev/null
+++ b/src/chrome/locale/nl/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welkom
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Privacy
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Verkennen
+
+onboarding.tour-tor-security=Beveiliging
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion Services
+onboarding.tour-tor-onion-services.title=Onion Services
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd
index 7b7e6dbb..27e0003d 100644
--- a/src/chrome/locale/nl/torbutton.dtd
+++ b/src/chrome/locale/nl/torbutton.dtd
@@ -47,5 +47,5 @@
 <!ENTITY torbutton.prefs.sec_limit_typography "Sommige lettertypen en wiskundige symbolen zijn uitgeschakeld.">
 <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Sommige lettertypen, pictogrammen, wiskundige symbolen en afbeeldingen zijn uitgeschakeld.">
 <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio en video (HTML5-media) zijn klik-bij-afspelen.">
-<!ENTITY torbutton.circuit_display.title "Tor Circuit">
-<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site">
+<!ENTITY torbutton.circuit_display.title "Torcircuit">
+<!ENTITY torbutton.circuit_display.new_circuit "Nieuw circuit voor deze website">
diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties
index d190ceed..9379a730 100644
--- a/src/chrome/locale/nl/torbutton.properties
+++ b/src/chrome/locale/nl/torbutton.properties
@@ -54,5 +54,5 @@ profileAccessDenied=%S heeft niet de juiste permissies om toegang te krijgen tot
 profileMigrationFailed=Migreren van uw bestaande %S profiel is mislukt.\nNieuwe instellingen zijn nu van toepassing.
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=Verbinding versleuteld (Oniondienst, %1$S, %2$S bit sleutels, %3$S)
+pageInfo_OnionEncryption=Verbinding versleuteld (Oniondienst)
diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd
index 71d69e78..f7f4c143 100644
--- a/src/chrome/locale/pl/aboutTor.dtd
+++ b/src/chrome/locale/pl/aboutTor.dtd
@@ -1,47 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Informacje na temat Tor'a">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "OstrzeÅ¼enie: ta przeglÄ?darka jest nieaktualna.">
-<!ENTITY aboutTor.outOfDateTorOff.label "PONADTO, ta przeglÄ?darka jest nieaktualna.">
-<!ENTITY aboutTor.outOfDate2.label "Kliknij na ikonÄ? cebuli, a nastÄ?pnie wybierz SprawdÅº czy sÄ? dostÄ?pne aktualizacje.">
-
-<!ENTITY aboutTor.check.label "Przetestuj Ustawienia Sieci Tor">
-
-<!ENTITY aboutTor.success.label "Witamy w Tor Browser">
-<!ENTITY aboutTor.success2.label "PoÅ?Ä?czono z sieciÄ? Tor">
-<!ENTITY aboutTor.success3.label "MoÅ¼esz teraz swobodnie przeglÄ?daÄ? Internet anonimowo.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "CoÅ? poszÅ?o nie tak!">
 <!ENTITY aboutTor.failure2.label "Tor nie dziaÅ?a w tej przeglÄ?darce.">
 
-<!ENTITY aboutTor.search.label "Szukaj">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Dodatkowe informacje:">
-<!ENTITY aboutTor.torInfo2.label "Kraj i adres IP:">
-<!ENTITY aboutTor.torInfo3.label "WÄ?zeÅ? WyjÅ?ciowy:">
-<!ENTITY aboutTor.torInfo4.label "Ten serwer nie rejestruje Å¼adnych informacji o odwiedzajÄ?cych.">
-<!ENTITY aboutTor.whatnextQuestion.label "Co dalej?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor, to NIE jest wszystko czego potrzebujesz, aby przeglÄ?daÄ? sieÄ? anonimowo! ByÄ? moÅ¼e potrzeba bÄ?dzie zmieniÄ? niektÃ³re Twoje nawyki internetowe, aby zapewniÄ? Twojej toÅ¼samoÅ?ci bezpieczeÅ?stwo.">
-<!ENTITY aboutTor.whatnext.label "Porady: Jak pozostaÄ? anonimowym w internecie Â»">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Pytania?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Instrukcja korzystania z Tor Browser">
-<!ENTITY aboutTor.helpInfo1.label "MoÅ¼esz pomÃ³c!">
-<!ENTITY aboutTor.helpInfo2.label "Istnieje wiele sposobÃ³w, abyÅ? mÃ³gÅ? uczyniÄ? sieÄ? Tor'a szybszÄ? i silniejszÄ?:">
-<!ENTITY aboutTor.helpInfo3.label "Uruchom PrzekaÅºnikowy WÄ?zeÅ? Tora Â»">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "ZgÅ?oÅ? siÄ? na ochotnika Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "PrzekaÅ¼ darowiznÄ? Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
-
-<!ENTITY aboutTor.footer.label "Projekt Tor jest organizacjÄ? non-profit*, zajmujÄ?ca siÄ? badaniami, rozwojem i edukacji o anonimowoÅ?ci i prywatnoÅ?ci w internecie.
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-* 501(c)(3)">
-<!ENTITY aboutTor.learnMore.label "Dowiedz siÄ? wiÄ?cej na temat Tor Project Â»">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/pl/browserOnboarding.properties b/src/chrome/locale/pl/browserOnboarding.properties
new file mode 100644
index 00000000..629a09a3
--- /dev/null
+++ b/src/chrome/locale/pl/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Witamy
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=PrywatnoÅ?Ä?
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=BezpieczeÅ?stwo
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=UsÅ?ugi Tor
+onboarding.tour-tor-onion-services.title=UsÅ?ugi Tor
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd
index 99a3c6bc..97e5e0f8 100644
--- a/src/chrome/locale/pt-BR/aboutTor.dtd
+++ b/src/chrome/locale/pt-BR/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Sobre Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "AVISO: este navegador estÃ¡ desatualizado.">
-<!ENTITY aboutTor.outOfDateTorOff.label "AINDA, este navegador estÃ¡ desatualizado.">
-<!ENTITY aboutTor.outOfDate2.label "Clique na cebola e escolha Verificar AtualizaÃ§Ãµes do Navegador Tor.">
-
-<!ENTITY aboutTor.check.label "Testar as configuraÃ§Ãµes de rede Tor">
-
-<!ENTITY aboutTor.success.label "Boas-vindas ao Navegador Tor!">
-<!ENTITY aboutTor.success2.label "Conectad0 Ã  rede Tor!">
-<!ENTITY aboutTor.success3.label "Sinta-se Ã  vontade para navegar anonimamente na Internet.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "Alguma coisa deu errado!">
 <!ENTITY aboutTor.failure2.label "Tor nÃ£o estÃ¡ funcionando neste navegador. ">
 
-<!ENTITY aboutTor.search.label "Buscar">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Para mais informaÃ§Ãµes:">
-<!ENTITY aboutTor.torInfo2.label "PaÃs e EndereÃ§o IP:">
-<!ENTITY aboutTor.torInfo3.label "NÃ³ de saÃda:">
-<!ENTITY aboutTor.torInfo4.label "Este servidor nÃ£o registra nenhuma informaÃ§Ã£o sobre os seus usuÃ¡rios.">
-<!ENTITY aboutTor.whatnextQuestion.label "O que mais?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor NÃ?O Ã© tudo o que vocÃª precisa para navegar anonimamente! Para isso, vocÃª precisarÃ¡ mudar alguns hÃ¡bitos de utilizaÃ§Ã£o da Internet, que garantirÃ£o a proteÃ§Ã£o da sua identidade. ">
-<!ENTITY aboutTor.whatnext.label "Dicas para garantir seu anonimato&quot;">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Perguntas?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Manual de Uso do Navegador Tor ">
-<!ENTITY aboutTor.helpInfo1.label "VocÃª pode ajudar!">
-<!ENTITY aboutTor.helpInfo2.label "Existem vÃ¡rias maneiras de ajudar a rede Tor a tornar-se mais rÃ¡pida e eficaz:">
-<!ENTITY aboutTor.helpInfo3.label "Rodar um NÃ³ de Retransmissor Tor Â»">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Trabalhar voluntariamente&quot;">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Fazer uma doaÃ§Ã£o&quot;">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "O Projeto Tor Ã© uma organizaÃ§Ã£o sem fins lucrativos - EUA 501(c)(3) -, dedicada Ã  pesquisa, ao desenvolvimento e Ã  educaÃ§Ã£o relacionados ao anonimato e Ã  privacidade na Internet.">
-<!ENTITY aboutTor.learnMore.label "Informe-se mais sobre o Projeto Tor&quot;">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/pt-BR/browserOnboarding.properties b/src/chrome/locale/pt-BR/browserOnboarding.properties
new file mode 100644
index 00000000..3d39f44a
--- /dev/null
+++ b/src/chrome/locale/pt-BR/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Bem Vindo
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Privacidade
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explorar
+
+onboarding.tour-tor-security=SeguranÃ§a
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=ServiÃ§os Onion
+onboarding.tour-tor-onion-services.title=ServiÃ§os Onion
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/pt-BR/torbutton.properties b/src/chrome/locale/pt-BR/torbutton.properties
index 0a8453c4..09ea7581 100644
--- a/src/chrome/locale/pt-BR/torbutton.properties
+++ b/src/chrome/locale/pt-BR/torbutton.properties
@@ -31,10 +31,10 @@ torbutton.popup.confirm_plugins = Plugins como o Flash podem prejudicar sua priv
 torbutton.popup.never_ask_again = NÃ£o me pergunte novamente
 torbutton.popup.confirm_newnym = O navegador Tor fecharÃ¡ todas as janelas e abas. Todas as sessÃµes de websites serÃ£o perdidas.\n\nVocÃª deseja reiniciar o navegador Tor agora para reiniciar a sua identidade?\n\n
 
-torbutton.slider_notification = O menu cebola verde agora dispÃµe de uma opcÃ£o que lhe permite ajustar o seu nivel de seguranca. DÃª uma conferida!
+torbutton.slider_notification = O menu cebola verde agora dispÃµe de uma opÃ§Ã£o que lhe permite ajustar o seu nivel de seguranca. DÃª uma conferida!
 torbutton.slider_notification_button = Abra as definiÃ§Ãµes de seguranÃ§a.
 
-torbutton.maximize_warning = Maximizar o Navegador Tor pode permitir aos websites determinar o tamanho do seu monitor, que pode ser usado para rastreÃ¡-lo. NÃ³s recomendamos que vocÃª deixe a janela do Navegador Tor no seu tamanho original.
+torbutton.maximize_warning = Maximizar o Navegador Tor pode permitir que websites determinem o tamanho do monitor, o que pode ser usado para rastreÃ¡-lo. Recomenda-se deixar a janela do Navegador Tor no seu tamanho original.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=Este website (%S) tentou extrair dados de imagem CANVAS HTML5, que podem ser usados para identificar o seu computador.\n\nVocÃª deseja que o Navegador Tor permita que este website extraia dados de imagem CANVAS HTML5?
@@ -48,11 +48,11 @@ canvas.neverAccessKey=e
 # Profile/startup error messages. Strings are kept here for ease of translation.
 # LOCALIZATION NOTE: %S is the application name.
 profileProblemTitle=Problema com o Perfil %S 
-profileReadOnly=NÃ£o Ã© possÃvel executar %S a partir de um sistema de arquivo "somente-leitura". Por favor, copie %S em um outro local antes de tentar utilizÃ¡-lo.
-profileReadOnlyMac=NÃ£o Ã© possÃvel executar %S a partir de um sistema de arquivo "somente-leitura". Por favor, copie %S no seu Desktop ou em uma pasta de AplicaÃ§Ãµes antes de tentar utilizÃ¡-lo.\n 
+profileReadOnly=NÃ£o Ã© possÃvel executar %S a partir de um sistema de arquivo "somente-leitura". Copie %S em um outro local antes de tentar usÃ¡-lo.
+profileReadOnlyMac=NÃ£o Ã© possÃvel executar %S a partir de um sistema de arquivo "somente-leitura". Copie %S no seu Desktop ou em uma pasta de AplicaÃ§Ãµes antes de tentar usÃ¡-lo.\n 
 profileAccessDenied=%S nÃ£o possui permissÃ£o para acessar o perfil. Por favor, ajuste as suas permissÃµes de arquivo de sistema e tente novamente. 
-profileMigrationFailed=MigraÃ§Ã£o de seu perfil  %S existente falhou.\nNovas configuraÃ§Ãµes serÃ£o utilizadas.
+profileMigrationFailed=MigraÃ§Ã£o de seu perfil  %S existente falhou.\nNovas configuraÃ§Ãµes serÃ£o usadas.
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=ConexÃ£o criptografada (ServiÃ§o Onion, %1$S, %2$S bit keys, %3$S)
+pageInfo_OnionEncryption=ConexÃ£o criptografada (ServiÃ§o Onion)
diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd
index f12276e0..f30e3c4a 100644
--- a/src/chrome/locale/ru/aboutTor.dtd
+++ b/src/chrome/locale/ru/aboutTor.dtd
@@ -1,46 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Ð? Ð¿Ñ?Ð¾ÐµÐºÑ?Ðµ Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: Ð?Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?ÐµÑ?Ðµ Ñ?Ñ?Ð°Ñ?Ñ?Ñ? Ð²ÐµÑ?Ñ?Ð¸Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð°.">
-<!ENTITY aboutTor.outOfDateTorOff.label "Ð?Ð Ð?Ð?Ð? Ð¢Ð?Ð?Ð?, Ð´Ð°Ð½Ð½Ñ?Ð¹ Ð±Ñ?Ð°Ñ?Ð·ÐµÑ? Ñ?Ñ?Ñ?Ð°Ñ?ÐµÐ».">
-<!ENTITY aboutTor.outOfDate2.label "Ð?Ð°Ð¶Ð¼Ð¸Ñ?Ðµ Ð½Ð° &quot;Ð»Ñ?ÐºÐ¾Ð²Ð¸Ñ?Ñ?&quot;Ð¸ Ð·Ð°Ñ?ÐµÐ¼ Ð²Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ &quot;Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ñ? Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° Tor&quot;">
-
-<!ENTITY aboutTor.check.label "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ñ?ÐµÑ?Ð¸ Tor">
-
-<!ENTITY aboutTor.success.label "Ð?Ð°Ñ? Ð¿Ñ?Ð¸Ð²ÐµÑ?Ñ?Ñ?Ð²Ñ?ÐµÑ? Tor Browser">
-<!ENTITY aboutTor.success2.label "Ð¡ÐµÑ?Ñ? Tor Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð°.">
-<!ENTITY aboutTor.success3.label "Ð¢ÐµÐ¿ÐµÑ?Ñ? Ð?Ñ? Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ñ? Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ñ?Ð°Ð¹Ñ?Ñ? Ð² Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ðµ.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "Ð§Ñ?Ð¾-Ñ?Ð¾ Ð¿Ð¾Ñ?Ð»Ð¾ Ð½Ðµ Ñ?Ð°Ðº!">
 <!ENTITY aboutTor.failure2.label "Tor Ð½Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ð°ÐµÑ? Ð² Ñ?Ñ?Ð¾Ð¼ Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ðµ.">
 
-<!ENTITY aboutTor.search.label "Ð?Ð¾Ð¸Ñ?Ðº">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!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.torbrowser_user_manual_questions.label "Ð?Ð¾Ð¿Ñ?Ð¾Ñ?Ñ??">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "Ð?">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Ð Ñ?ÐºÐ¾Ð²Ð¾Ð´Ñ?Ñ?Ð²Ð¾ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ? Tor Browser.">
-<!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.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "Ð?Ñ?Ð¾ÐµÐºÑ? Tor - Ñ?Ñ?Ð¾ Ð¿Ð¾Ð»Ñ?Ð·Ñ?Ñ?Ñ?Ð°Ñ?Ñ?Ñ? Ð¿Ñ?Ð¸Ð²Ð¸Ð»ÐµÐ³Ð¸Ñ?Ð¼Ð¸ Ð¡Ð¨Ð? 501(c)(3) Ð½ÐµÐºÐ¾Ð¼Ð¼ÐµÑ?Ñ?ÐµÑ?ÐºÐ°Ñ? Ð¾Ñ?Ð³Ð°Ð½Ð¸Ð·Ð°Ñ?Ð¸Ñ?, Ñ?ÐµÐ»Ñ?Ñ? ÐºÐ¾Ñ?Ð¾Ñ?Ð¾Ð¹ Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ð¿Ñ?Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ Ð¸Ñ?Ñ?Ð»ÐµÐ´Ð¾Ð²Ð°Ð½Ð¸Ð¹, Ñ?Ð°Ð·Ð²Ð¸Ñ?Ð¸Ðµ Ð¸ Ð¾Ð±Ñ?Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð² Ñ?Ñ?ÐµÑ?Ðµ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾Ñ?Ñ?Ð¸ Ð¸ Ð»Ð¸Ñ?Ð½Ñ?Ñ? Ð´Ð°Ð½Ð½Ñ?Ñ? Ð¾Ð½Ð»Ð°Ð¹Ð½.">
-<!ENTITY aboutTor.learnMore.label "Ð£Ð·Ð½Ð°Ð¹Ñ?Ðµ Ð±Ð¾Ð»Ñ?Ñ?Ðµ Ð¾ Ð¿Ñ?Ð¾ÐµÐºÑ?Ðµ Tor Â»">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html#ru
-">
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html#ru";>
diff --git a/src/chrome/locale/ru/browserOnboarding.properties b/src/chrome/locale/ru/browserOnboarding.properties
new file mode 100644
index 00000000..d7f4a352
--- /dev/null
+++ b/src/chrome/locale/ru/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Ð?Ð¾Ð±Ñ?Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ?Ñ?
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Ð?Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ñ?
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Ð?Ð±Ð·Ð¾Ñ?
+
+onboarding.tour-tor-security=Ð?ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ñ?
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion-Ñ?ÐµÑ?Ð²Ð¸Ñ?Ñ?
+onboarding.tour-tor-onion-services.title=Onion-Ñ?ÐµÑ?Ð²Ð¸Ñ?Ñ?
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties
index d3ccbd89..687a52e2 100644
--- a/src/chrome/locale/ru/torbutton.properties
+++ b/src/chrome/locale/ru/torbutton.properties
@@ -54,5 +54,5 @@ profileAccessDenied=Ð£ %S Ð½ÐµÑ? Ñ?Ð°Ð·Ñ?ÐµÑ?ÐµÐ½Ð¸Ñ? Ð½Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿ Ðº Ð¿Ñ?
 profileMigrationFailed=Ð?ÐµÑ?ÐµÐ¼ÐµÑ?ÐµÐ½Ð¸Ðµ Ð²Ð°Ñ?ÐµÐ³Ð¾ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?Ñ?Ñ?ÐµÐ³Ð¾ %S Ð¿Ñ?Ð¾Ñ?Ð¸Ð»Ñ? Ð½Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ?.\nÐ?Ñ?Ð´Ñ?Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ?Ñ?Ñ? Ð½Ð¾Ð²Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸.
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ð·Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð¾ (Onion Service, %1$S, %2$S Ð±Ð¸Ñ?Ð½Ñ?Ðµ ÐºÐ»Ñ?Ñ?Ð¸, %3$S)
+pageInfo_OnionEncryption=Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ð·Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð¾ (Onion Service)
diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd
index 1e4b30fc..2a02c639 100644
--- a/src/chrome/locale/sv/aboutTor.dtd
+++ b/src/chrome/locale/sv/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Om Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "VARNING: den hÃ¤r webblÃ¤saren Ã¤r inte uppdaterad.">
-<!ENTITY aboutTor.outOfDateTorOff.label "DESSUTOM, denna webblÃ¤sare Ã¤r ej uppdaterad.">
-<!ENTITY aboutTor.outOfDate2.label "Klicka pÃ¥ Tor-lÃ¶ken och vÃ¤lj sedan 'SÃ¶k efter uppdateringar fÃ¶r Tor webblÃ¤sare'.">
-
-<!ENTITY aboutTor.check.label "Testa nÃ¤tverksinstÃ¤llningarna fÃ¶r Tor">
-
-<!ENTITY aboutTor.success.label "VÃ¤lkommen till Tor-webblÃ¤saren">
-<!ENTITY aboutTor.success2.label "Ansluten till Tor-nÃ¤tverket.">
-<!ENTITY aboutTor.success3.label "Du kan nu surfa pÃ¥ nÃ¤tet anonymt.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "NÃ¥gonting gick fel!">
 <!ENTITY aboutTor.failure2.label "Tor fungerar inte i den hÃ¤r webblÃ¤saren.">
 
-<!ENTITY aboutTor.search.label "SÃ¶k">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Ytterligare information:">
-<!ENTITY aboutTor.torInfo2.label "Land och IP-adress:">
-<!ENTITY aboutTor.torInfo3.label "Exitnod:">
-<!ENTITY aboutTor.torInfo4.label "Den hÃ¤r servern sparar inte nÃ¥gon information om besÃ¶kare.">
-<!ENTITY aboutTor.whatnextQuestion.label "Och nu dÃ¥?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor Ã¤r INTE allt som behÃ¶vs fÃ¶r att vara anonym pÃ¥ nÃ¤tet! Du behÃ¶ver kanske Ã¤ndra nÃ¥gra av dina vanor fÃ¶r att sÃ¤kerstÃ¤lla att din identitet fÃ¶rblir skyddad.">
-<!ENTITY aboutTor.whatnext.label "Tips pÃ¥ hur man fÃ¶rblir anonym Â»">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "FrÃ¥gor?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser anvÃ¤ndarmanual">
-<!ENTITY aboutTor.helpInfo1.label "Du kan hjÃ¤lpa till!">
-<!ENTITY aboutTor.helpInfo2.label "Det finns mÃ¥nga sÃ¤tt du kan hjÃ¤lpa till med att gÃ¶ra Tor-nÃ¤tverket snabbare och sÃ¤krare:">
-<!ENTITY aboutTor.helpInfo3.label "KÃ¶r ett Tor-relÃ¤ Â»">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Erbjud din hjÃ¤lp Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "GÃ¶r en donation Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "Tor projektet Ã¤r en US 501(c)(3) non-profit organisation som utfÃ¶r forskning, utveckling, och utbildning inom online anonymitet och integritet.">
-<!ENTITY aboutTor.learnMore.label "Mer information om Tor-projektet Â»">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/sv/browserOnboarding.properties b/src/chrome/locale/sv/browserOnboarding.properties
new file mode 100644
index 00000000..6ad7b625
--- /dev/null
+++ b/src/chrome/locale/sv/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Sekretess
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=SÃ¤kerhet
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion tjÃ¤nster
+onboarding.tour-tor-onion-services.title=Onion tjÃ¤nster
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd
index 9ebd8452..f0f68b49 100644
--- a/src/chrome/locale/tr/aboutTor.dtd
+++ b/src/chrome/locale/tr/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Tor HakkÄ±nda">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "UYARI: bu tarayÄ±cÄ± gÃ¼ncel deÄ?il.">
-<!ENTITY aboutTor.outOfDateTorOff.label "AYRICA, bu tarayÄ±cÄ± gÃ¼ncel deÄ?il.">
-<!ENTITY aboutTor.outOfDate2.label "SoÄ?an simgesine tÄ±klayÄ±n ve ardÄ±ndan Tor Browser GÃ¼ncellemesini denetleyin.">
-
-<!ENTITY aboutTor.check.label "Tor AÄ? AyarlarÄ±nÄ± SÄ±nayÄ±n">
-
-<!ENTITY aboutTor.success.label "Tor Browser UygulamasÄ±na HoÅ? Geldiniz">
-<!ENTITY aboutTor.success2.label "Tor aÄ?Ä±na baÄ?lanÄ±ldÄ±.">
-<!ENTITY aboutTor.success3.label "ArtÄ±k Ä°nternet'te Ã¶zgÃ¼rce ve anonim olarak dolaÅ?abilirsiniz.">
+<!ENTITY aboutTor.ready.label "KeÅ?fet. Gizlice.">
+<!ENTITY aboutTor.ready2.label "DÃ¼nyanÄ±n en kiÅ?isel web tarama deneyimine hazÄ±rsÄ±nÄ±z.">
 <!ENTITY aboutTor.failure.label "Bir Å?eyler Ters Gitti!">
 <!ENTITY aboutTor.failure2.label "Tor bu tarayÄ±cÄ± ile Ã§alÄ±Å?mÄ±yor.">
 
-<!ENTITY aboutTor.search.label "Arama">
+<!ENTITY aboutTor.search.label "DuckDuckGo ile ArayÄ±n">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Ek Bilgiler:">
-<!ENTITY aboutTor.torInfo2.label "Ã?lke ve IP Adresi:">
-<!ENTITY aboutTor.torInfo3.label "Ã?Ä±kÄ±Å? NoktasÄ±:">
-<!ENTITY aboutTor.torInfo4.label "Bu sunucu ziyaretÃ§iler hakkÄ±nda herhangi bir bilgi toplamaz.">
-<!ENTITY aboutTor.whatnextQuestion.label "Å?imdi ne olacak?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor, anonim kalmanÄ±z iÃ§in gerek duyacaÄ?Ä±nÄ±z her Å?eyi saÄ?lamaz! KimliÄ?inizin gÃ¼vende kalmasÄ± iÃ§in bazÄ± Ä°nternet alÄ±Å?kanlÄ±klarÄ±nÄ±zÄ± deÄ?iÅ?tirmeniz gerekebilir.">
-<!ENTITY aboutTor.whatnext.label "Anonim Kalma Ä°puÃ§larÄ± Â»">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "SorularÄ±nÄ±z mÄ± var?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Tor Browser Rehberine BakÄ±n">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser KullanÄ±m KÄ±lavuzu">
-<!ENTITY aboutTor.helpInfo1.label "YardÄ±m Edebilirsiniz!">
-<!ENTITY aboutTor.helpInfo2.label "Tor aÄ?Ä±nÄ± daha hÄ±zlÄ± gÃ¼Ã§lÃ¼ kÄ±lmaya yardÄ±mcÄ± olabilmenin Ã§eÅ?itli yollarÄ± var:">
-<!ENTITY aboutTor.helpInfo3.label "Tor AktarÄ±cÄ± NoktasÄ± Ã?alÄ±Å?tÄ±r Â»">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "GÃ¶nÃ¼llÃ¼ Destekte Bulunun Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "BaÄ?Ä±Å? YapÄ±n Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Rehberi">
 
-<!ENTITY aboutTor.footer.label "Tor Projesi, ABD 501(c)(3) kapsamÄ±nda Ã§evrim iÃ§i gizlilik ve mahremiyet Ã¼zerine araÅ?tÄ±rma, geliÅ?tirme ve eÄ?itim Ã§alÄ±Å?malarÄ± yapan ve kar amacÄ± gÃ¼tmeyen bir kuruluÅ?tur.">
-<!ENTITY aboutTor.learnMore.label "Tor Projesi hakkÄ±nda daha Ã§ok Å?ey Ã¶Ä?renin Â»">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "Tor Projesi, US 501(c)(3) koÅ?ullarÄ±na uygun olarak, Ã¶zgÃ¼r ve aÃ§Ä±k kaynaklÄ± anonimlik ve kiÅ?isel gizlilik teknolojileri geliÅ?tirerek insan haklarÄ± ve Ã¶zgÃ¼rlÃ¼klerini ileriye gÃ¶tÃ¼rmeyi, bu teknolojilerin bilimsel ve kÃ¼ltÃ¼rel olarak bilinirliÄ?ini arttÄ±rmayÄ± ve herkes tarafÄ±ndan eriÅ?ebilmesini saÄ?lamak amacÄ±yla Ã§alÄ±Å?an, kar amacÄ± gÃ¼tmeyen bir kuruluÅ?tur.">
+<!ENTITY aboutTor.getInvolved.label "KatkÄ±da Bulunun Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/tr/browserOnboarding.properties b/src/chrome/locale/tr/browserOnboarding.properties
new file mode 100644
index 00000000..22bd337d
--- /dev/null
+++ b/src/chrome/locale/tr/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Courier'a
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Gizlilik
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=KeÅ?fet
+
+onboarding.tour-tor-security=GÃ¼venlik
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion Hizmetleri
+onboarding.tour-tor-onion-services.title=Onion Hizmetleri
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index ab781315..052c0932 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/tr/torbutton.dtd
@@ -1,6 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Yeni Kimlik">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.new_circuit "Bu site iÃ§in Tor devresini yenile">
+<!ENTITY torbutton.context_menu.new_circuit "Bu Sitenin Tor Devresini Yenile">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
 <!ENTITY torbutton.context_menu.preferences "GÃ¼venlik AyarlarÄ±...">
 <!ENTITY torbutton.context_menu.preferences.key "S">
diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd
index 4bc3ad53..c79065b5 100644
--- a/src/chrome/locale/vi/aboutTor.dtd
+++ b/src/chrome/locale/vi/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "ThÃ´ng tin vá»? Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "Cáº¢NH BÃ?O: trÃ¬nh duyá»?t nÃ y Ä?Ã£ lá»?i thá»?i">
-<!ENTITY aboutTor.outOfDateTorOff.label "ThÃªm ná»¯a, trÃ¬nh duyá»?t nÃ y Ä?Ã£ lá»?i thá»?i.">
-<!ENTITY aboutTor.outOfDate2.label "Báº¥m chuá»?t vÃ o cá»§ hÃ nh vÃ  sau Ä?Ã³ chá»?n Kiá»?m tra báº£n cáºp nháºt cá»§a TrÃ¬nh duyá»?t Tor">
-
-<!ENTITY aboutTor.check.label "Thá» cÃ i Ä?áº·t máº¡ng lÆ°á»?i Tor">
-
-<!ENTITY aboutTor.success.label "ChÃ o má»«ng Ä?áº¿n vá»?i TrÃ¬nh duyá»?t Tor">
-<!ENTITY aboutTor.success2.label "Ä?Ã£ káº¿t ná»?i vá»?i máº¡ng lÆ°á»?i Tor.">
-<!ENTITY aboutTor.success3.label "BÃ¢y giá»? báº¡n sáº½ tá»± do lÆ°á»?t web áº©n danh.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "CÃ³ gÃ¬ Ä?Ã³ Ä?Ã£ sai!">
 <!ENTITY aboutTor.failure2.label "Tor khÃ´ng hoáº¡t Ä?á»?ng trÃªn trÃ¬nh duyá»?t nÃ y.">
 
-<!ENTITY aboutTor.search.label "TÃ¬m kiáº¿m">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "ThÃ´ng tin thÃªm:">
-<!ENTITY aboutTor.torInfo2.label "Quá»?c gia &amp; Ä?á»?a chá»? IP:">
-<!ENTITY aboutTor.torInfo3.label "ThoÃ¡t khá»?i giao Ä?iá»?m:">
-<!ENTITY aboutTor.torInfo4.label "MÃ¡y chá»§ nÃ y khÃ´ng ghi láº¡i báº¥t ká»³ thÃ´ng tin nÃ o cá»§a khÃ¡ch truy cáºp.">
-<!ENTITY aboutTor.whatnextQuestion.label "Ä?iá»?u gÃ¬ tiáº¿p theo?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor KHÃ?NG pháº£i lÃ  táº¥t cáº£ nhá»¯ng gÃ¬ báº¡n cáº§n Ä?á»? áº©n danh! Báº¡n cáº§n nÃªn thay Ä?á»?i má»?t vÃ i thÃ³i quen lÆ°á»?t net Ä?á»? cháº¯c cháº¯n ráº±ng xÃ¡c minh danh tÃnh sáº½ an toÃ n.">
-<!ENTITY aboutTor.whatnext.label "Gá»£i Ã½ cho viá»?c áº©n danh Â»">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Nhá»¯ng cÃ¢u há»?i?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "HÆ°á»?ng dáº«n sá» dá»¥ng TrÃ¬nh duyá»?t Tor">
-<!ENTITY aboutTor.helpInfo1.label "Báº¡n cÃ³ thá»? giÃºp Ä?á»¡!">
-<!ENTITY aboutTor.helpInfo2.label "CÃ³ nhiá»?u cÃ¡ch mÃ  báº¡n cÃ³ thá»? giÃºp máº¡ng Tor nhanh hÆ¡n vÃ  tá»?t hÆ¡n.">
-<!ENTITY aboutTor.helpInfo3.label "Cháº¡y má»?t Ä?áº§u má»?i tiáº¿p sá»©c Tor Â»">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "TÃ¬nh nguyá»?n nhá»¯ng dá»?ch vá»¥ cá»§a báº¡n Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "á»¦ng há»? Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "Dá»± Ã¡n Tor lÃ  má»?t tá»? chá»©c khÃ´ng lá»£i nhuáºn theo US 501(c)(3) chuyÃªn vá»? nghiÃªn cá»©u, phÃ¡t triá»?n vÃ  giÃ¡o dá»¥c vá»? vÃ´ danh vÃ javascript:; riÃªng tÆ° trá»±c tuyáº¿n.">
-<!ENTITY aboutTor.learnMore.label "TÃ¬m hiá»?u thÃªm vá»? Tor Project">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/vi/aboutTor.properties b/src/chrome/locale/vi/aboutTor.properties
index 5542fac9..56a00af1 100644
--- a/src/chrome/locale/vi/aboutTor.properties
+++ b/src/chrome/locale/vi/aboutTor.properties
@@ -17,4 +17,4 @@ aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activ
 aboutTor.donationBanner.tagline2=Networking Freedom Worldwide
 aboutTor.donationBanner.tagline3=Freedom Online
 aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide
-aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day
+aboutTor.donationBanner.tagline5=Báº£o vá»? riÃªng tÆ° cá»§a hÃ ng triá»?u ngÆ°á»?i má»?i ngÃ y
diff --git a/src/chrome/locale/vi/browserOnboarding.properties b/src/chrome/locale/vi/browserOnboarding.properties
new file mode 100644
index 00000000..4c63fa1c
--- /dev/null
+++ b/src/chrome/locale/vi/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Xin chÃ o
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=RiÃªng tÆ°
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=Báº£o máºt
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=CÃ¡c Dá»?ch vá»¥ Onion
+onboarding.tour-tor-onion-services.title=CÃ¡c Dá»?ch vá»¥ Onion
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index 6bbd492d..77f447b9 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/vi/torbutton.dtd
@@ -34,18 +34,18 @@
 <!ENTITY torbutton.prefs.sec_caption "Má»©c Ä?á»? Báº£o máºt">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Nhá»¯ng NgÆ°á»?i Ä?iá»?u chá»?nh an ninh Ä?á»? cho báº¡n vÃ´ hiá»?u má»?t vÃ i tÃnh nÄ?ng cá»§a trÃ¬nh duyá»?t mÃ  cÃ³ thá»? lÃ m trÃ¬nh duyá»?t cá»§a báº¡n dá»? bá»? tá»?n thÆ°Æ¡ng Ä?á»?i vá»?i nhá»¯ng cá»? gáº¯ng táº¥n cÃ´ng.">
 <!ENTITY torbutton.prefs.sec_standard_label "Chuáº©n">
-<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
-<!ENTITY torbutton.prefs.sec_safer_label "Safer">
-<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
-<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
-<!ENTITY torbutton.prefs.sec_safest_label "Safest">
-<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
-<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_standard_description "Táº¥t cáº£ cÃ¡c tÃnh nÄ?ng cá»§a TrÃ¬nh duyá»?t Tor vÃ  trang web Ä?á»?u Ä?Æ°á»£c báºt.">
+<!ENTITY torbutton.prefs.sec_safer_label "An toÃ n hÆ¡n">
+<!ENTITY torbutton.prefs.sec_safer_description "VÃ´ hiá»?u hÃ³a tÃnh nÄ?ng website thÆ°á»?ng gÃ¢y nguy hiá»?m, khiáº¿n má»?t sá»? trang web máº¥t chá»©c nÄ?ng.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "á»? cÃ i Ä?áº·t an toÃ n hÆ¡n:">
+<!ENTITY torbutton.prefs.sec_safest_label "An toÃ n nháº¥t">
+<!ENTITY torbutton.prefs.sec_safest_description "Chá»? cho phÃ©p cÃ¡c tÃnh nÄ?ng trang web Ä?Æ°á»£c yÃªu cáº§u cho cÃ¡c trang web tÄ©nh vÃ  cÃ¡c dá»?ch vá»¥ cÆ¡ báº£n. Nhá»¯ng thay Ä?á»?i nÃ y áº£nh hÆ°á»?ng Ä?áº¿n hÃ¬nh áº£nh, phÆ°Æ¡ng tiá»?n vÃ  táºp lá»?nh.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "á»? cÃ i Ä?áº·t an toÃ n nháº¥t:">
 <!ENTITY torbutton.prefs.sec_learn_more_label "Biáº¿t thÃªm">
-<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript bá»? vÃ´ hiá»?u trÃªn cÃ¡c trang web khÃ´ng cÃ³ HTTPS.">
 <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript máº·c Ä?á»?nh bá»? vÃ´ hiá»?u trÃªn táº¥t cáº£ cÃ¡c trang.">
-<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
-<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
-<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
-<!ENTITY torbutton.circuit_display.title "Tor Circuit">
-<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site">
+<!ENTITY torbutton.prefs.sec_limit_typography "Má»?t sá»? phÃ´ng chá»¯ vÃ  kÃ½ hiÃªu toÃ¡n há»?c bá»? vÃ´ hiá»?u.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Má»?t sá»? phÃ´ng chá»¯, biá»?u tÆ°á»£ng, vÃ  hÃ¬nh áº£nh bá»? vÃ´ hiá»?u.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Ã?m thanh vÃ  video (HTML5 media) pháº£i báº¥m-Ä?á»?-phÃ¡t. ">
+<!ENTITY torbutton.circuit_display.title "Máº¡ch Tor">
+<!ENTITY torbutton.circuit_display.new_circuit "Máº¡ch Tor má»?i cho trang nÃ y">
diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties
index aa10e5f5..d304b7e8 100644
--- a/src/chrome/locale/vi/torbutton.properties
+++ b/src/chrome/locale/vi/torbutton.properties
@@ -5,8 +5,8 @@ torbutton.circuit_display.this_browser = TrÃ¬nh duyá»?t nÃ y
 torbutton.circuit_display.relay = Tiáº¿p sá»©c
 torbutton.circuit_display.tor_bridge = Cáº§u ná»?i
 torbutton.circuit_display.unknown_country = Ä?áº¥t nÆ°á»?c khÃ´ng Ä?Æ°á»£c biáº¿t Ä?áº¿n
-torbutton.circuit_display.guard = Guard
-torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+torbutton.circuit_display.guard = Báº£o vá»?
+torbutton.circuit_display.guard_note = NÃºt [Báº£o vá»?} cá»§a báº¡n cÃ³ thá»? khÃ´ng thay Ä?á»?i.
 torbutton.circuit_display.learn_more = Biáº¿t thÃªm
 torbutton.content_sizer.margin_tooltip = TrÃ¬nh duyá»?t Tor thÃªm lá»? nÃ y Ä?á»? lÃ m cho chiá»?u rá»?ng vÃ  chiá»?u cao cá»§a mÃ n hÃ¬nh cá»§a báº¡n Ãt dá»? bá»? phÃ¢n biá»?t hÆ¡n, vÃ  vÃ¬ tháº¿ giáº£m kháº£ nÄ?ng cá»§a nhá»¯ng ngÆ°á»?i theo dÃµi báº¡n trá»±c tuyáº¿n.
 torbutton.panel.tooltip.disabled = Nháº¥n Ä?á»? báºt Tor
@@ -54,5 +54,5 @@ profileAccessDenied=%S khÃ´ng Ä?Æ°á»£c phÃ©p truy cáºp cáº¥u hÃ¬nh. Vui lÃ²ng 
 profileMigrationFailed=Viá»?c di chuyá»?n há»? sÆ¡ %S hiá»?n táº¡i cá»§a báº¡n Ä?Ã£ tháº¥t báº¡i.\nNhá»¯ng cÃ i Ä?áº·t má»?i sáº½ Ä?Æ°á»£c sá» dá»¥ng.
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=Ä?Ã£ mÃ£ hÃ³a káº¿t ná»?i (Onion Service, %1$S, %2$S bit keys, %3$S)
+pageInfo_OnionEncryption=Ä?Ã£ mÃ£ hÃ³a káº¿t ná»?i (Onion Service)
diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd
index 27283582..47d2a899 100644
--- a/src/chrome/locale/zh-CN/aboutTor.dtd
+++ b/src/chrome/locale/zh-CN/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "å?³äº? Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "è¦å??ï¼?æ¤æµ?è§?å?¨ç??æ?¬è¿?æ?§ã??">
-<!ENTITY aboutTor.outOfDateTorOff.label "å?¦å¤?ï¼?è¯¥æµ?è§?å?¨å¹¶é??æ??æ?°ç??æ?¬ã??">
-<!ENTITY aboutTor.outOfDate2.label "ç?¹å?»æ´?è?±å?¾æ ?ï¼?ç?¶å??é??æ?©â??Tor Browser æ£?æ?¥æ?´æ?°â??ã??">
-
-<!ENTITY aboutTor.check.label "æµ?è¯? Tor ç½?ç»?è®¾ç½®">
-
-<!ENTITY aboutTor.success.label "æ¬¢è¿?ä½¿ç?¨ Tor Browser">
-<!ENTITY aboutTor.success2.label "å·²è¿?æ?¥å?° Tor ç½?ç»?ã??">
-<!ENTITY aboutTor.success3.label "ç?°å?¨å?³å?¯è?ªç?±å?°å?¿å??è®¿é?®äº?è??ç½?ã??">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "å?ºé??äº?ï¼?">
 <!ENTITY aboutTor.failure2.label "Tor æ? æ³?å?¨è¯¥æµ?è§?å?¨ä¸?è¿?è¡?ã??">
 
-<!ENTITY aboutTor.search.label "å®?å?¨ç??æ??ç´¢å¼?æ??">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!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.torbrowser_user_manual_questions.label "æ??ç??é?®ï¼?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser ç?¨æ?·æ??å??">
-<!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 "æ??ä¾?å¿?æ?¿æ??å?¡ Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "æ??å?© Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!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";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/zh-CN/browserOnboarding.properties b/src/chrome/locale/zh-CN/browserOnboarding.properties
new file mode 100644
index 00000000..aa157e16
--- /dev/null
+++ b/src/chrome/locale/zh-CN/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=æ¬¢è¿?
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=é??ç§?
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=å®?å?¨
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=æ´?è?±æ??å?¡
+onboarding.tour-tor-onion-services.title=æ´?è?±æ??å?¡
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/zh-TW/aboutTor.dtd b/src/chrome/locale/zh-TW/aboutTor.dtd
index 7c5d11cf..e5b4e099 100644
--- a/src/chrome/locale/zh-TW/aboutTor.dtd
+++ b/src/chrome/locale/zh-TW/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "é??æ?¼æ´?è?¥è·¯ç?±">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "è¦å??ï¼?æ¤ç??è¦½å?¨ç??ç??æ?¬å·²ç¶?é??æ??ã??">
-<!ENTITY aboutTor.outOfDateTorOff.label "ä¸¦ä¸?ï¼?æ¤ç??è¦½å?¨å·²é??æ??ã??">
-<!ENTITY aboutTor.outOfDate2.label "é»?æ??æ´?è?¥æ??é??ç?¶å¾?é?¸æ??æª¢æ?¥æ´?è?¥è·¯ç?±ç??è¦½å?¨æ?´æ?°">
-
-<!ENTITY aboutTor.check.label "æ¸¬è©¦æ´?è?¥è·¯ç?±ç¶²è·¯è¨å®?">
-
-<!ENTITY aboutTor.success.label "æ¡è¿?ä½¿ç?¨æ´?è?¥è·¯ç?±ç??è¦½å?¨">
-<!ENTITY aboutTor.success2.label "å·²ç¶?é?£æ?¥ä¸?æ´?è?¥è·¯ç?±ç¶²è·¯">
-<!ENTITY aboutTor.success3.label "æ?¨ç?¾å?¨å?¯ä»¥è?ªç?±è?ªå?¨å?°ä»¥å?¿å??ç??æ??ç??è¦½ç¶²é??ç¶²è·¯ã??">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "ç?¼ç??é?¯èª¤ï¼?">
 <!ENTITY aboutTor.failure2.label "æ´?è?¥è·¯ç?±ç?¡æ³?å?¨æ¤ç??è¦½å?¨ä¸é??ä½?ã??">
 
-<!ENTITY aboutTor.search.label "æ??å°?">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!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 "æ´?è?¥è·¯ç?±ä¸?æ?¯ç¢ºä¿?æ?¨å?¯ä»¥å?¿å??ç??è¦½ç??è?¬é??ä¸¹ï¼?æ?¨ä»?é??è¦?æ?¹è®?ä¸?äº?å??äººç??ä¸?ç¶²ç??è¦½ç¿?æ?£ï¼?ä»¥ç¢ºä¿?æ?¨å??äººèº«ä»½ç??å®?å?¨ã??">
-<!ENTITY aboutTor.whatnext.label "ä¿?æ??å?¿å??ç??ç§?è¨£ Â»">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "æ??ä»?éº¼å??é¡?ï¼?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual Â»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "æ´?è?¥è·¯ç?±ç??è¦½å?¨ä¹?ä½¿ç?¨è??æ??å??">
-<!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 "è²¢ç?»æ?¨ç??æ??å?? Â»">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "æ??è´? Â»">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "Tor Project æ?¯ä¸?å??ç¾?å?? 501(c)(3) é??ç??å?©çµ?ç¹?ï¼?è?´å??æ?¼ç·?ä¸?å?¿å??è??é?±ç§?ç??ç ?ç©¶ã??é??ç?¼å??æ??è?²ã??">
-<!ENTITY aboutTor.learnMore.label "äº?è§£æ?´å¤? Tor Project ç?¸é??è³?è¨? Â»">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved Â»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/zh-TW/browserOnboarding.properties b/src/chrome/locale/zh-TW/browserOnboarding.properties
new file mode 100644
index 00000000..ca84f692
--- /dev/null
+++ b/src/chrome/locale/zh-TW/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=æ¡è¿?
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=é?±ç§?
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=æ?¢ç´¢
+
+onboarding.tour-tor-security=å®?å?¨
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=æ´?è?¥æ??å??
+onboarding.tour-tor-onion-services.title=æ´?è?¥æ??å??
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd
index 3cb32b19..0ddbd823 100644
--- a/src/chrome/locale/zh-TW/torbutton.dtd
+++ b/src/chrome/locale/zh-TW/torbutton.dtd
@@ -47,5 +47,5 @@
 <!ENTITY torbutton.prefs.sec_limit_typography "æ??äº?å?å½¢è??æ?¸å¸ç¬¦è??è¢«å??ç?¨">
 <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "æ??äº?å?å??,å??æ¨?,æ?¸å¸ç¬¦è??è??å??ç??è¢«å??ç?¨">
 <!ENTITY torbutton.prefs.sec_click_to_play_media "è?²é?³å??å½±ç?? (HTML5 åª?é«?) è¦?é»?æ??æ?æ?¾">
-<!ENTITY torbutton.circuit_display.title "Tor Circuit">
-<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site">
+<!ENTITY torbutton.circuit_display.title "Tor è¿´è·¯">
+<!ENTITY torbutton.circuit_display.new_circuit "å»ºç«?æ?°ç??è¿´è·¯ä¾?é?£æ?¥ä¸?æ¤ç¶²ç«?">
diff --git a/src/chrome/locale/zh-TW/torbutton.properties b/src/chrome/locale/zh-TW/torbutton.properties
index 864d7fee..bc31f27e 100644
--- a/src/chrome/locale/zh-TW/torbutton.properties
+++ b/src/chrome/locale/zh-TW/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.circuit_display.relay = ä¸ç¹¼
 torbutton.circuit_display.tor_bridge = æ©?æ?¥å?¨
 torbutton.circuit_display.unknown_country = æ?ªç?¥ç??å??å®¶
 torbutton.circuit_display.guard = Guard
-torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+torbutton.circuit_display.guard_note = ä½ ç??[Guard]ç¯?é»?å?¯è?½ä¸?æ??æ?´æ?¹ã??
 torbutton.circuit_display.learn_more = ç¹¼çº?é?±è®?
 torbutton.content_sizer.margin_tooltip = æ´?è?¥è·¯ç?±ç??è¦½å?¨ç?¹æ??å°?è¦?çª?é??æ¡?ç??å¯¬åº¦å??é«?åº¦é??æ?°è¨ç½®ï¼?ä»¥ä¾¿è®?æ?¨ç??ç??è¦½å?¨ç??æ??è³?è¨?ç??èµ·ä¾?æ?´ç?ºæ?®é??ï¼?å¦?æ¤å?¯ä»¥æ¸?å°?æ?¨ç??ç¶²è·¯æ´»å??è¢«è?å?¥ä¸¦è¿½è¹¤ç??å?¯è?½æ?§ã??
 torbutton.panel.tooltip.disabled = æ??ä¸?ä¸?ä»¥å??ç?¨æ´?è?¥è·¯ç?±
@@ -54,5 +54,5 @@ profileAccessDenied=%S æ²?æ??è¶³å¤ ç??å?å??æ¬?é??ï¼?è«?é??æ?°èª¿æ?´æ?¨ç??æª?æ¡?
 profileMigrationFailed=ç?¡æ³?è½?ç§»è?³æ?¨ç?¾å?ç??%Sè³?æ??å¤¾ã??\nå°?ä½¿ç?¨æ?°è¨å®?ã??
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=é?£æ?¥å? å¯?(æ´?è?¥æ??å??, %1$S, %2$S bit keys, %3$S)
+pageInfo_OnionEncryption=é?£æ?¥å? å¯?ï¼?æ´?è?¥æ??å??ï¼?

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

Prev by Author: [tor-commits] [torbutton/master] Bug 26884 - Part 3: Remove optionsURL from install.rdf
Next by Author: [tor-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
Previous by thread: [tor-commits] [torbutton/master] Move bn-BD to locales for non-official builds
Next by thread: [tor-commits] [torbutton/master] Translations update
Index(es):
- Author
- Thread